From f68766b33fa291b6f69dc5ebfa54ff3aad0a401f Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Thu, 11 Dec 2025 14:55:11 +0100 Subject: [PATCH 1/2] CI/Docs: [documentation.manuals] does not need [oc.build_amd64-exp] Remove [job_build_x86_64_exp] from the legacy needs of [job_manuals]. Remove the job as well from the legacy needs of the [documentation.daily] and [documentation.update] pipelines. --- .gitlab/ci/pipelines/before_merging.yml | 2 - .gitlab/ci/pipelines/documentation.daily.yml | 65 ------------------- .gitlab/ci/pipelines/documentation.update.yml | 65 ------------------- .gitlab/ci/pipelines/merge_train.yml | 2 - docs/ci/documentation_ci.ml | 6 -- 5 files changed, 140 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index a719b0e5fff2..cadc64e43cbe 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -3247,13 +3247,11 @@ documentation.manuals: - oc.docker:ci:amd64 - oc.build_x86_64-released - oc.build_amd64-extra-dev - - oc.build_amd64-exp - oc.build_kernels dependencies: - oc.docker:ci:amd64 - oc.build_x86_64-released - oc.build_amd64-extra-dev - - oc.build_amd64-exp - oc.build_kernels timeout: 60 minutes interruptible: true diff --git a/.gitlab/ci/pipelines/documentation.daily.yml b/.gitlab/ci/pipelines/documentation.daily.yml index fc47b58ef3d3..29b07b72daed 100644 --- a/.gitlab/ci/pipelines/documentation.daily.yml +++ b/.gitlab/ci/pipelines/documentation.daily.yml @@ -195,69 +195,6 @@ oc.build_amd64-extra-dev: - etherlink-governance-observer when: on_success -oc.build_amd64-exp: - image: ${ci_image_name}/build:${ci_image_tag} - stage: build - tags: - - gcp_very_high_cpu - rules: - - when: always - needs: - - oc.docker:ci:amd64 - dependencies: - - oc.docker:ci:amd64 - timeout: 60 minutes - cache: - - key: cargo-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo/registry/cache - policy: pull-push - - key: dune-build-cache-$CI_PIPELINE_ID - paths: - - $CI_PROJECT_DIR/_dune_cache - policy: push - before_script: - - SCRIPT_STEP_BEGIN=$(date +%s) - - . ./scripts/ci/datadog_send_job_info.sh - - ./scripts/ci/take_ownership.sh - - . ./scripts/version.sh - - eval $(opam env) - - . ./scripts/ci/datadog_send_job_cache_info.sh 'before' - - . ./scripts/ci/sccache-start.sh - script: - - ./scripts/ci/build_full_unreleased.sh - - . ./scripts/ci/datadog_send_job_script_step_time.sh || true - after_script: - - . ./scripts/ci/datadog_send_job_cache_info.sh 'after' - - ./scripts/ci/sccache-stop.sh - - eval $(opam env) - - dune cache trim --size=5GB - variables: - ARCH: x86_64 - EXECUTABLE_FILES: script-inputs/experimental-executables - CARGO_NET_OFFLINE: "false" - CARGO_INCREMENTAL: "0" - SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET - SCCACHE_GCS_RW_MODE: READ_WRITE - SCCACHE_GCS_KEY_PREFIX: sccache - SCCACHE_IGNORE_SERVER_IO_ERROR: "1" - SCCACHE_IDLE_TIMEOUT: "0" - DUNE_CACHE: enabled - DUNE_CACHE_STORAGE_MODE: hardlink - DUNE_CACHE_ROOT: $CI_PROJECT_DIR/_dune_cache - artifacts: - name: build-$ARCH-$CI_COMMIT_REF_SLUG - expire_in: 1 day - paths: - - octez-* - - octez-teztale-* - - src/proto_*/parameters/*.json - - _build/default/src/lib_protocol_compiler/bin/main_native.exe - - _build/default/tezt/tests/main.exe - - _build/default/contrib/octez_injector_server/octez_injector_server.exe - - etherlink-governance-observer - when: on_success - oc.build_kernels: image: ${rust_toolchain_image_name}:${rust_toolchain_image_tag} stage: build @@ -337,13 +274,11 @@ documentation.manuals: - oc.docker:ci:amd64 - oc.build_x86_64-released - oc.build_amd64-extra-dev - - oc.build_amd64-exp - oc.build_kernels dependencies: - oc.docker:ci:amd64 - oc.build_x86_64-released - oc.build_amd64-extra-dev - - oc.build_amd64-exp - oc.build_kernels timeout: 60 minutes interruptible: false diff --git a/.gitlab/ci/pipelines/documentation.update.yml b/.gitlab/ci/pipelines/documentation.update.yml index 38a49a909e5a..d8331a535f28 100644 --- a/.gitlab/ci/pipelines/documentation.update.yml +++ b/.gitlab/ci/pipelines/documentation.update.yml @@ -195,69 +195,6 @@ oc.build_amd64-extra-dev: - etherlink-governance-observer when: on_success -oc.build_amd64-exp: - image: ${ci_image_name}/build:${ci_image_tag} - stage: build - tags: - - gcp_very_high_cpu - rules: - - when: always - needs: - - oc.docker:ci:amd64 - dependencies: - - oc.docker:ci:amd64 - timeout: 60 minutes - cache: - - key: cargo-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo/registry/cache - policy: pull-push - - key: dune-build-cache-$CI_PIPELINE_ID - paths: - - $CI_PROJECT_DIR/_dune_cache - policy: push - before_script: - - SCRIPT_STEP_BEGIN=$(date +%s) - - . ./scripts/ci/datadog_send_job_info.sh - - ./scripts/ci/take_ownership.sh - - . ./scripts/version.sh - - eval $(opam env) - - . ./scripts/ci/datadog_send_job_cache_info.sh 'before' - - . ./scripts/ci/sccache-start.sh - script: - - ./scripts/ci/build_full_unreleased.sh - - . ./scripts/ci/datadog_send_job_script_step_time.sh || true - after_script: - - . ./scripts/ci/datadog_send_job_cache_info.sh 'after' - - ./scripts/ci/sccache-stop.sh - - eval $(opam env) - - dune cache trim --size=5GB - variables: - ARCH: x86_64 - EXECUTABLE_FILES: script-inputs/experimental-executables - CARGO_NET_OFFLINE: "false" - CARGO_INCREMENTAL: "0" - SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET - SCCACHE_GCS_RW_MODE: READ_WRITE - SCCACHE_GCS_KEY_PREFIX: sccache - SCCACHE_IGNORE_SERVER_IO_ERROR: "1" - SCCACHE_IDLE_TIMEOUT: "0" - DUNE_CACHE: enabled - DUNE_CACHE_STORAGE_MODE: hardlink - DUNE_CACHE_ROOT: $CI_PROJECT_DIR/_dune_cache - artifacts: - name: build-$ARCH-$CI_COMMIT_REF_SLUG - expire_in: 1 day - paths: - - octez-* - - octez-teztale-* - - src/proto_*/parameters/*.json - - _build/default/src/lib_protocol_compiler/bin/main_native.exe - - _build/default/tezt/tests/main.exe - - _build/default/contrib/octez_injector_server/octez_injector_server.exe - - etherlink-governance-observer - when: on_success - oc.build_kernels: image: ${rust_toolchain_image_name}:${rust_toolchain_image_tag} stage: build @@ -317,13 +254,11 @@ documentation.manuals: - oc.docker:ci:amd64 - oc.build_x86_64-released - oc.build_amd64-extra-dev - - oc.build_amd64-exp - oc.build_kernels dependencies: - oc.docker:ci:amd64 - oc.build_x86_64-released - oc.build_amd64-extra-dev - - oc.build_amd64-exp - oc.build_kernels timeout: 60 minutes interruptible: false diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index 65489360a969..01f7ed9de9c0 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -3142,13 +3142,11 @@ documentation.manuals: - oc.docker:ci:amd64 - oc.build_x86_64-released - oc.build_amd64-extra-dev - - oc.build_amd64-exp - oc.build_kernels dependencies: - oc.docker:ci:amd64 - oc.build_x86_64-released - oc.build_amd64-extra-dev - - oc.build_amd64-exp - oc.build_kernels timeout: 60 minutes interruptible: true diff --git a/docs/ci/documentation_ci.ml b/docs/ci/documentation_ci.ml index 4555dd112385..f6a280aa20d4 100644 --- a/docs/ci/documentation_ci.ml +++ b/docs/ci/documentation_ci.ml @@ -131,8 +131,6 @@ let job_manuals = ( Artifacts, Tezos_ci_jobs.Code_verification.job_build_x86_64_extra_dev Before_merging ); - ( Artifacts, - Tezos_ci_jobs.Code_verification.job_build_x86_64_exp Before_merging ); ] ~only_if_changed:Files.odoc ~force_if_label:["ci--docs"] @@ -264,8 +262,6 @@ let register () = Schedule_extended_test; Tezos_ci_jobs.Code_verification.job_build_x86_64_extra_dev Schedule_extended_test; - Tezos_ci_jobs.Code_verification.job_build_x86_64_exp - Schedule_extended_test; ] [ (Auto, job_rst_check); @@ -286,8 +282,6 @@ let register () = Schedule_extended_test; Tezos_ci_jobs.Code_verification.job_build_x86_64_extra_dev Schedule_extended_test; - Tezos_ci_jobs.Code_verification.job_build_x86_64_exp - Schedule_extended_test; ] [(Auto, job_publish)] ; () -- GitLab From c92b7785f5e26596ed0567c9ed6de1109e6f81c6 Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Thu, 11 Dec 2025 14:59:31 +0100 Subject: [PATCH 2/2] CI/Docs: [documentation.manuals] does not need [oc.build_kernels] Remove [job_build_kernels] from the needs of [job_manuals]. --- .gitlab/ci/pipelines/before_merging.yml | 9 --- .gitlab/ci/pipelines/documentation.daily.yml | 78 ------------------- .gitlab/ci/pipelines/documentation.update.yml | 78 ------------------- .gitlab/ci/pipelines/merge_train.yml | 9 --- docs/ci/documentation_ci.ml | 1 - 5 files changed, 175 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index cadc64e43cbe..70f214ff0e55 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -1544,29 +1544,23 @@ oc.build_kernels: tags: - gcp_very_high_cpu rules: - - if: $CI_MERGE_REQUEST_LABELS =~ /(?:^|,)ci--docs(?:$|,)/ - when: on_success - changes: - - '**/*.rst' - .gitlab-ci.yml - .gitlab/ci/pipelines/before_merging.yml - .gitlab/ci/pipelines/merge_train.yml - Makefile - brassaia-eio/**/* - brassaia/**/* - - client-libs/**/*.ml* - contrib/mir/**/*.lalrpop - contrib/mir/**/*.rs - contrib/mir/**/*.toml - contrib/mir/**/Cargo.lock - data-encoding/**/* - - docs/**/* - dune - dune-project - dune-workspace - etherlink.mk - etherlink/**/* - - grafazos/doc/**/* - images/create_image.sh - images/rust-toolchain/**/* - images/scripts/install_datadog_static.sh @@ -1584,7 +1578,6 @@ oc.build_kernels: - src/**/* - tezt/**/* - tzt_reference_test_suite/**/* - - vendors/**/*.ml* when: on_success needs: - oc.docker:rust-toolchain:amd64 @@ -3247,12 +3240,10 @@ documentation.manuals: - oc.docker:ci:amd64 - oc.build_x86_64-released - oc.build_amd64-extra-dev - - oc.build_kernels dependencies: - oc.docker:ci:amd64 - oc.build_x86_64-released - oc.build_amd64-extra-dev - - oc.build_kernels timeout: 60 minutes interruptible: true before_script: diff --git a/.gitlab/ci/pipelines/documentation.daily.yml b/.gitlab/ci/pipelines/documentation.daily.yml index 29b07b72daed..a7158c5e0262 100644 --- a/.gitlab/ci/pipelines/documentation.daily.yml +++ b/.gitlab/ci/pipelines/documentation.daily.yml @@ -34,32 +34,6 @@ oc.docker:ci:amd64: reports: dotenv: ci_image_tag.env -oc.docker:rust-toolchain:amd64: - image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.13.0 - stage: images - tags: - - gcp - dependencies: [] - timeout: 60 minutes - before_script: - - SCRIPT_STEP_BEGIN=$(date +%s) - - . ./scripts/ci/datadog_send_job_info.sh - - . ./scripts/ci/datadog_send_job_cache_info.sh 'before' - script: - - ./scripts/ci/docker_rust_toolchain_build.sh - - . ./scripts/ci/datadog_send_job_script_step_time.sh || true - after_script: - - . ./scripts/ci/datadog_send_job_cache_info.sh 'after' - services: - - docker:${DOCKER_VERSION}-dind - variables: - DOCKER_VERSION: 24.0.7 - CI_DOCKER_HUB: "false" - IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-rust:unstable - artifacts: - reports: - dotenv: rust_toolchain_image_tag.env - datadog_pipeline_trace: image: datadog/ci:v4.1.0 stage: start @@ -195,56 +169,6 @@ oc.build_amd64-extra-dev: - etherlink-governance-observer when: on_success -oc.build_kernels: - image: ${rust_toolchain_image_name}:${rust_toolchain_image_tag} - stage: build - tags: - - gcp_very_high_cpu - needs: - - oc.docker:rust-toolchain:amd64 - dependencies: - - oc.docker:rust-toolchain:amd64 - timeout: 60 minutes - cache: - key: cargo-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo/registry/cache - policy: pull-push - interruptible: false - before_script: - - SCRIPT_STEP_BEGIN=$(date +%s) - - . ./scripts/ci/datadog_send_job_info.sh - - . ./scripts/ci/datadog_send_job_cache_info.sh 'before' - - . ./scripts/ci/sccache-start.sh - script: - - make -f kernels.mk build - - make -f etherlink.mk evm_kernel.wasm - - . ./scripts/ci/datadog_send_job_script_step_time.sh || true - after_script: - - . ./scripts/ci/datadog_send_job_cache_info.sh 'after' - - ./scripts/ci/sccache-stop.sh - variables: - CC: clang - NATIVE_TARGET: x86_64-unknown-linux-musl - CARGO_NET_OFFLINE: "false" - CARGO_INCREMENTAL: "0" - SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET - SCCACHE_GCS_RW_MODE: READ_WRITE - SCCACHE_GCS_KEY_PREFIX: sccache - SCCACHE_IGNORE_SERVER_IO_ERROR: "1" - SCCACHE_IDLE_TIMEOUT: "0" - artifacts: - name: build-kernels-$CI_COMMIT_REF_SLUG - expire_in: 1 day - paths: - - evm_kernel.wasm - - smart-rollup-installer - - sequenced_kernel.wasm - - tx_kernel.wasm - - tx_kernel_dal.wasm - - dal_echo_kernel.wasm - when: on_success - documentation.rst-check: image: ${ci_image_name_protected}/test:amd64--master stage: test @@ -274,12 +198,10 @@ documentation.manuals: - oc.docker:ci:amd64 - oc.build_x86_64-released - oc.build_amd64-extra-dev - - oc.build_kernels dependencies: - oc.docker:ci:amd64 - oc.build_x86_64-released - oc.build_amd64-extra-dev - - oc.build_kernels timeout: 60 minutes interruptible: false before_script: diff --git a/.gitlab/ci/pipelines/documentation.update.yml b/.gitlab/ci/pipelines/documentation.update.yml index d8331a535f28..de29c4f64af4 100644 --- a/.gitlab/ci/pipelines/documentation.update.yml +++ b/.gitlab/ci/pipelines/documentation.update.yml @@ -34,32 +34,6 @@ oc.docker:ci:amd64: reports: dotenv: ci_image_tag.env -oc.docker:rust-toolchain:amd64: - image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.13.0 - stage: images - tags: - - gcp - dependencies: [] - timeout: 60 minutes - before_script: - - SCRIPT_STEP_BEGIN=$(date +%s) - - . ./scripts/ci/datadog_send_job_info.sh - - . ./scripts/ci/datadog_send_job_cache_info.sh 'before' - script: - - ./scripts/ci/docker_rust_toolchain_build.sh - - . ./scripts/ci/datadog_send_job_script_step_time.sh || true - after_script: - - . ./scripts/ci/datadog_send_job_cache_info.sh 'after' - services: - - docker:${DOCKER_VERSION}-dind - variables: - DOCKER_VERSION: 24.0.7 - CI_DOCKER_HUB: "false" - IMAGE: ${GCP_PROTECTED_REGISTRY}/tezos/tezos/debian-rust:unstable - artifacts: - reports: - dotenv: rust_toolchain_image_tag.env - datadog_pipeline_trace: image: datadog/ci:v4.1.0 stage: start @@ -195,56 +169,6 @@ oc.build_amd64-extra-dev: - etherlink-governance-observer when: on_success -oc.build_kernels: - image: ${rust_toolchain_image_name}:${rust_toolchain_image_tag} - stage: build - tags: - - gcp_very_high_cpu - needs: - - oc.docker:rust-toolchain:amd64 - dependencies: - - oc.docker:rust-toolchain:amd64 - timeout: 60 minutes - cache: - key: cargo-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo/registry/cache - policy: pull-push - interruptible: false - before_script: - - SCRIPT_STEP_BEGIN=$(date +%s) - - . ./scripts/ci/datadog_send_job_info.sh - - . ./scripts/ci/datadog_send_job_cache_info.sh 'before' - - . ./scripts/ci/sccache-start.sh - script: - - make -f kernels.mk build - - make -f etherlink.mk evm_kernel.wasm - - . ./scripts/ci/datadog_send_job_script_step_time.sh || true - after_script: - - . ./scripts/ci/datadog_send_job_cache_info.sh 'after' - - ./scripts/ci/sccache-stop.sh - variables: - CC: clang - NATIVE_TARGET: x86_64-unknown-linux-musl - CARGO_NET_OFFLINE: "false" - CARGO_INCREMENTAL: "0" - SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET - SCCACHE_GCS_RW_MODE: READ_WRITE - SCCACHE_GCS_KEY_PREFIX: sccache - SCCACHE_IGNORE_SERVER_IO_ERROR: "1" - SCCACHE_IDLE_TIMEOUT: "0" - artifacts: - name: build-kernels-$CI_COMMIT_REF_SLUG - expire_in: 1 day - paths: - - evm_kernel.wasm - - smart-rollup-installer - - sequenced_kernel.wasm - - tx_kernel.wasm - - tx_kernel_dal.wasm - - dal_echo_kernel.wasm - when: on_success - documentation.manuals: image: ${ci_image_name}/test:${ci_image_tag} stage: build @@ -254,12 +178,10 @@ documentation.manuals: - oc.docker:ci:amd64 - oc.build_x86_64-released - oc.build_amd64-extra-dev - - oc.build_kernels dependencies: - oc.docker:ci:amd64 - oc.build_x86_64-released - oc.build_amd64-extra-dev - - oc.build_kernels timeout: 60 minutes interruptible: false before_script: diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index 01f7ed9de9c0..ba7840f90d4a 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -1463,29 +1463,23 @@ oc.build_kernels: tags: - gcp_very_high_cpu rules: - - if: $CI_MERGE_REQUEST_LABELS =~ /(?:^|,)ci--docs(?:$|,)/ - when: on_success - changes: - - '**/*.rst' - .gitlab-ci.yml - .gitlab/ci/pipelines/before_merging.yml - .gitlab/ci/pipelines/merge_train.yml - Makefile - brassaia-eio/**/* - brassaia/**/* - - client-libs/**/*.ml* - contrib/mir/**/*.lalrpop - contrib/mir/**/*.rs - contrib/mir/**/*.toml - contrib/mir/**/Cargo.lock - data-encoding/**/* - - docs/**/* - dune - dune-project - dune-workspace - etherlink.mk - etherlink/**/* - - grafazos/doc/**/* - images/create_image.sh - images/rust-toolchain/**/* - images/scripts/install_datadog_static.sh @@ -1503,7 +1497,6 @@ oc.build_kernels: - src/**/* - tezt/**/* - tzt_reference_test_suite/**/* - - vendors/**/*.ml* when: on_success needs: - oc.docker:rust-toolchain:amd64 @@ -3142,12 +3135,10 @@ documentation.manuals: - oc.docker:ci:amd64 - oc.build_x86_64-released - oc.build_amd64-extra-dev - - oc.build_kernels dependencies: - oc.docker:ci:amd64 - oc.build_x86_64-released - oc.build_amd64-extra-dev - - oc.build_kernels timeout: 60 minutes interruptible: true before_script: diff --git a/docs/ci/documentation_ci.ml b/docs/ci/documentation_ci.ml index f6a280aa20d4..df3f40db841b 100644 --- a/docs/ci/documentation_ci.ml +++ b/docs/ci/documentation_ci.ml @@ -121,7 +121,6 @@ let job_manuals = ~description: "Build the command-line interface manuals (man pages) of Octez \ executables." - ~needs:[(Artifacts, Tezos_ci_jobs.Kernels.job_build_kernels)] ~needs_legacy: (* It's ok to assume Before_merging here because we only care about the job name. *) [ -- GitLab