From 2f6692215821ef2f59957bdbd85c7d3cb41029ed Mon Sep 17 00:00:00 2001 From: saroupille Date: Thu, 4 Apr 2024 16:26:37 +0200 Subject: [PATCH] Manifest: Release the DAL node --- .gitlab/ci/jobs/packaging/opam_package.yml | 100 +++++++++++++++++---- manifest/product_octez.ml | 2 +- script-inputs/ci-opam-package-tests | 13 +-- script-inputs/experimental-executables | 1 - script-inputs/released-executables | 1 + 5 files changed, 91 insertions(+), 26 deletions(-) diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index 4dfd2c27334c..b0be3a1b1cba 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -705,6 +705,70 @@ opam:octez-dac-node: when: always retry: 2 +opam:octez-dal-node: + image: ${build_deps_image_name}:runtime-prebuild-dependencies--${build_deps_image_version} + stage: packaging + tags: + - gcp + rules: + - if: $CI_PIPELINE_SOURCE == "schedule" && $TZ_SCHEDULE_KIND == "EXTENDED_TESTS" + when: delayed + start_in: 1 minute + - if: $CI_MERGE_REQUEST_LABELS =~ /(?:^|,)ci--opam(?:$|,)/ + when: delayed + start_in: 1 minute + - changes: + - '**/dune' + - '**/dune.inc' + - '**/*.dune.inc' + - '**/dune-project' + - '**/dune-workspace' + - '**/*.opam' + - .gitlab/ci/jobs/packaging/opam:prepare.yml + - .gitlab/ci/jobs/packaging/opam_package.yml + - manifest/manifest.ml + - manifest/main.ml + - scripts/opam-prepare-repo.sh + - scripts/version.sh + if: $CI_PIPELINE_SOURCE == "merge_request_event" + when: delayed + start_in: 1 minute + - when: never + needs: + - opam:prepare + dependencies: + - opam:prepare + cache: + key: opam-sccache + paths: + - _build/_sccache + before_script: + - eval $(opam env) + - mkdir -p $CI_PROJECT_DIR/opam_logs + - . ./scripts/ci/sccache-start.sh + script: + - opam remote add dev-repo ./_opam-repo-for-release + - opam install --yes ${package}.dev + - opam reinstall --yes --with-test ${package}.dev + after_script: + - sccache --stop-server || true + - eval $(opam env) + - OPAM_LOGS=opam_logs ./scripts/ci/opam_handle_output.sh + variables: + RUNTEZTALIAS: "true" + package: octez-dal-node + SCCACHE_DIR: $CI_PROJECT_DIR/_build/_sccache + RUSTC_WRAPPER: sccache + SCCACHE_ERROR_LOG: $CI_PROJECT_DIR/opam_logs/sccache.log + SCCACHE_IDLE_TIMEOUT: "0" + SCCACHE_LOG: debug + artifacts: + expire_in: 1 week + paths: + - opam_logs/ + when: always + retry: 2 + opam:octez-distributed-internal: image: ${build_deps_image_name}:runtime-prebuild-dependencies--${build_deps_image_version} stage: packaging @@ -1417,10 +1481,10 @@ opam:octez-protocol-002-PsYLVpVv-libs: rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $TZ_SCHEDULE_KIND == "EXTENDED_TESTS" when: delayed - start_in: 2 minutes + start_in: 3 minutes - if: $CI_MERGE_REQUEST_LABELS =~ /(?:^|,)ci--opam(?:$|,)/ when: delayed - start_in: 2 minutes + start_in: 3 minutes - changes: - '**/dune' - '**/dune.inc' @@ -1436,7 +1500,7 @@ opam:octez-protocol-002-PsYLVpVv-libs: - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" when: delayed - start_in: 2 minutes + start_in: 3 minutes - when: never needs: - opam:prepare @@ -2761,10 +2825,10 @@ opam:octez-rpc-process: rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $TZ_SCHEDULE_KIND == "EXTENDED_TESTS" when: delayed - start_in: 3 minutes + start_in: 4 minutes - if: $CI_MERGE_REQUEST_LABELS =~ /(?:^|,)ci--opam(?:$|,)/ when: delayed - start_in: 3 minutes + start_in: 4 minutes - changes: - '**/dune' - '**/dune.inc' @@ -2780,7 +2844,7 @@ opam:octez-rpc-process: - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" when: delayed - start_in: 3 minutes + start_in: 4 minutes - when: never needs: - opam:prepare @@ -3145,10 +3209,10 @@ opam:octez-smart-rollup-node-PtParisA: rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $TZ_SCHEDULE_KIND == "EXTENDED_TESTS" when: delayed - start_in: 1 minute + start_in: 2 minutes - if: $CI_MERGE_REQUEST_LABELS =~ /(?:^|,)ci--opam(?:$|,)/ when: delayed - start_in: 1 minute + start_in: 2 minutes - changes: - '**/dune' - '**/dune.inc' @@ -3164,7 +3228,7 @@ opam:octez-smart-rollup-node-PtParisA: - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" when: delayed - start_in: 1 minute + start_in: 2 minutes - when: never needs: - opam:prepare @@ -4489,10 +4553,10 @@ opam:tezos-protocol-005-PsBABY5H: rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $TZ_SCHEDULE_KIND == "EXTENDED_TESTS" when: delayed - start_in: 4 minutes + start_in: 5 minutes - if: $CI_MERGE_REQUEST_LABELS =~ /(?:^|,)ci--opam(?:$|,)/ when: delayed - start_in: 4 minutes + start_in: 5 minutes - changes: - '**/dune' - '**/dune.inc' @@ -4508,7 +4572,7 @@ opam:tezos-protocol-005-PsBABY5H: - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" when: delayed - start_in: 4 minutes + start_in: 5 minutes - when: never needs: - opam:prepare @@ -5385,10 +5449,10 @@ opam:tezos-protocol-017-PtNairob: rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $TZ_SCHEDULE_KIND == "EXTENDED_TESTS" when: delayed - start_in: 5 minutes + start_in: 6 minutes - if: $CI_MERGE_REQUEST_LABELS =~ /(?:^|,)ci--opam(?:$|,)/ when: delayed - start_in: 5 minutes + start_in: 6 minutes - changes: - '**/dune' - '**/dune.inc' @@ -5404,7 +5468,7 @@ opam:tezos-protocol-017-PtNairob: - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" when: delayed - start_in: 5 minutes + start_in: 6 minutes - when: never needs: - opam:prepare @@ -5833,10 +5897,10 @@ opam:tezos-proxy-server-config: rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $TZ_SCHEDULE_KIND == "EXTENDED_TESTS" when: delayed - start_in: 6 minutes + start_in: 7 minutes - if: $CI_MERGE_REQUEST_LABELS =~ /(?:^|,)ci--opam(?:$|,)/ when: delayed - start_in: 6 minutes + start_in: 7 minutes - changes: - '**/dune' - '**/dune.inc' @@ -5852,7 +5916,7 @@ opam:tezos-proxy-server-config: - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" when: delayed - start_in: 6 minutes + start_in: 7 minutes - when: never needs: - opam:prepare diff --git a/manifest/product_octez.ml b/manifest/product_octez.ml index 758176b5c383..f072ade6a0db 100644 --- a/manifest/product_octez.ml +++ b/manifest/product_octez.ml @@ -7675,7 +7675,7 @@ let _octez_dal_node = ~path:"src/bin_dal_node" ~internal_name:"main" ~synopsis:"Tezos: `octez-dal-node` binary" - ~release_status:Experimental + ~release_status:Released ~with_macos_security_framework:true ~deps: ([ diff --git a/script-inputs/ci-opam-package-tests b/script-inputs/ci-opam-package-tests index bc72357d243a..f462a072ba8f 100644 --- a/script-inputs/ci-opam-package-tests +++ b/script-inputs/ci-opam-package-tests @@ -9,6 +9,7 @@ octez-codec exec 1 octez-crawler all 4 octez-dac-client exec 1 octez-dac-node exec 1 +octez-dal-node exec 1 octez-distributed-internal all 7 octez-distributed-lwt-internal all 7 octez-injector all 2 @@ -20,7 +21,7 @@ octez-node-config all 4 octez-proto-libs all 6 octez-protocol-000-Ps9mPmXa-libs all 2 octez-protocol-001-PtCJ7pwo-libs all 2 -octez-protocol-002-PsYLVpVv-libs all 2 +octez-protocol-002-PsYLVpVv-libs all 3 octez-protocol-003-PsddFKi3-libs all 3 octez-protocol-004-Pt24m4xi-libs all 3 octez-protocol-005-PsBabyM1-libs all 3 @@ -41,13 +42,13 @@ octez-protocol-019-PtParisA-libs all 2 octez-protocol-alpha-libs all 2 octez-protocol-compiler exec 6 octez-proxy-server exec 1 -octez-rpc-process all 3 +octez-rpc-process all 4 octez-shell-libs all 6 octez-signer exec 4 octez-smart-rollup-node exec 1 octez-smart-rollup-node-Proxford all 1 octez-smart-rollup-node-PtNairob all 2 -octez-smart-rollup-node-PtParisA all 1 +octez-smart-rollup-node-PtParisA all 2 octez-smart-rollup-node-alpha all 2 octez-smart-rollup-node-lib all 2 octez-smart-rollup-wasm-debugger exec 1 @@ -68,7 +69,7 @@ tezos-protocol-001-PtCJ7pwo all 4 tezos-protocol-002-PsYLVpVv all 4 tezos-protocol-003-PsddFKi3 all 4 tezos-protocol-004-Pt24m4xi all 4 -tezos-protocol-005-PsBABY5H all 4 +tezos-protocol-005-PsBABY5H all 5 tezos-protocol-005-PsBabyM1 all 5 tezos-protocol-006-PsCARTHA all 5 tezos-protocol-007-PsDELPH1 all 5 @@ -82,12 +83,12 @@ tezos-protocol-013-PtJakart all 5 tezos-protocol-014-PtKathma all 5 tezos-protocol-015-PtLimaPt all 5 tezos-protocol-016-PtMumbai all 5 -tezos-protocol-017-PtNairob all 5 +tezos-protocol-017-PtNairob all 6 tezos-protocol-018-Proxford all 6 tezos-protocol-019-PtParisA all 6 tezos-protocol-alpha all 6 tezos-protocol-demo-counter all 6 tezos-protocol-demo-noops all 6 tezos-protocol-genesis all 6 -tezos-proxy-server-config all 6 +tezos-proxy-server-config all 7 tezt-tezos all 7 diff --git a/script-inputs/experimental-executables b/script-inputs/experimental-executables index ea903a84e652..9da5f10da07a 100644 --- a/script-inputs/experimental-executables +++ b/script-inputs/experimental-executables @@ -1,4 +1,3 @@ octez-evm-node -octez-dal-node octez-accuser-alpha octez-baker-alpha diff --git a/script-inputs/released-executables b/script-inputs/released-executables index d922a01f400b..2d2dddcebec0 100644 --- a/script-inputs/released-executables +++ b/script-inputs/released-executables @@ -2,6 +2,7 @@ octez-smart-rollup-wasm-debugger octez-smart-rollup-node octez-dac-client octez-dac-node +octez-dal-node octez-signer octez-proxy-server octez-codec -- GitLab