From f37b7958a4565ddf703c23de68c43afde0bb0913 Mon Sep 17 00:00:00 2001 From: Neo <11726174-neo.nomadic@users.noreply.gitlab.com> Date: Fri, 21 Feb 2025 11:06:03 +0100 Subject: [PATCH] CI: tag [very_high_cpu] static binaries jobs --- .gitlab/ci/pipelines/before_merging.yml | 8 ++++---- .gitlab/ci/pipelines/master_branch.yml | 2 +- .gitlab/ci/pipelines/merge_train.yml | 8 ++++---- .gitlab/ci/pipelines/non_release_tag.yml | 2 +- .gitlab/ci/pipelines/non_release_tag_test.yml | 2 +- .gitlab/ci/pipelines/octez_beta_release_tag.yml | 2 +- .gitlab/ci/pipelines/octez_evm_node_release_tag.yml | 2 +- .gitlab/ci/pipelines/octez_monitoring.yml | 2 +- .gitlab/ci/pipelines/octez_release_tag.yml | 2 +- .gitlab/ci/pipelines/octez_release_tag_test.yml | 2 +- .gitlab/ci/pipelines/schedule_extended_test.yml | 8 ++++---- .gitlab/ci/pipelines/schedule_master_test_release.yml | 2 +- ci/bin/code_verification.ml | 4 +++- ci/bin/common.ml | 1 + ci/bin/master_branch.ml | 2 +- ci/bin/release_tag.ml | 2 ++ 16 files changed, 28 insertions(+), 23 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index c74ca103649a..cee11f98c72e 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -494,7 +494,7 @@ oc.build:static-x86_64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp + - gcp_very_high_cpu rules: - changes: - .gitlab-ci.yml @@ -692,7 +692,7 @@ oc.build_x86_64-exp-dev-extra: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp_high_cpu + - gcp_very_high_cpu rules: - changes: - .gitlab-ci.yml @@ -1261,7 +1261,7 @@ build-layer1-profiling: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp + - gcp_very_high_cpu dependencies: - oc.docker:ci:amd64 timeout: 60 minutes @@ -2732,7 +2732,7 @@ oc.script:snapshot_alpha_and_link: image: ${ci_image_name}/build:${ci_image_tag} stage: test tags: - - gcp + - gcp_very_high_cpu rules: - changes: - .gitlab-ci.yml diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index c0472bc11dfc..673375239683 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -77,7 +77,7 @@ oc.build:static-x86_64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp + - gcp_very_high_cpu rules: - when: always dependencies: diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index b757d42ad7b5..2075ff9d5298 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -493,7 +493,7 @@ oc.build:static-x86_64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp + - gcp_very_high_cpu rules: - changes: - .gitlab-ci.yml @@ -691,7 +691,7 @@ oc.build_x86_64-exp-dev-extra: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp_high_cpu + - gcp_very_high_cpu rules: - changes: - .gitlab-ci.yml @@ -1260,7 +1260,7 @@ build-layer1-profiling: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp + - gcp_very_high_cpu dependencies: - oc.docker:ci:amd64 timeout: 60 minutes @@ -2731,7 +2731,7 @@ oc.script:snapshot_alpha_and_link: image: ${ci_image_name}/build:${ci_image_tag} stage: test tags: - - gcp + - gcp_very_high_cpu rules: - changes: - .gitlab-ci.yml diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml index 2353f16ca72b..1666a2018288 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -72,7 +72,7 @@ oc.build:static-x86_64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp + - gcp_very_high_cpu needs: - oc.docker:ci:amd64 dependencies: diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml index bc6484f91897..270d7ef24780 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -72,7 +72,7 @@ oc.build:static-x86_64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp + - gcp_very_high_cpu needs: - oc.docker:ci:amd64 dependencies: diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml index f4e02d6331da..c68380a79626 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -72,7 +72,7 @@ oc.build:static-x86_64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp + - gcp_very_high_cpu needs: - oc.docker:ci:amd64 dependencies: diff --git a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml index 5ec9e9eb40e0..feffa02bfe77 100644 --- a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml @@ -113,7 +113,7 @@ oc.build:static-x86_64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp + - gcp_very_high_cpu dependencies: - oc.docker:ci:amd64 timeout: 60 minutes diff --git a/.gitlab/ci/pipelines/octez_monitoring.yml b/.gitlab/ci/pipelines/octez_monitoring.yml index 90969499bc34..b2b34c385b25 100644 --- a/.gitlab/ci/pipelines/octez_monitoring.yml +++ b/.gitlab/ci/pipelines/octez_monitoring.yml @@ -93,7 +93,7 @@ build-layer1-profiling: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp + - gcp_very_high_cpu dependencies: - oc.docker:ci:amd64 timeout: 60 minutes diff --git a/.gitlab/ci/pipelines/octez_release_tag.yml b/.gitlab/ci/pipelines/octez_release_tag.yml index ca32e55d5807..4fc1dfea454d 100644 --- a/.gitlab/ci/pipelines/octez_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_release_tag.yml @@ -73,7 +73,7 @@ oc.build:static-x86_64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp + - gcp_very_high_cpu needs: - oc.docker:ci:amd64 dependencies: diff --git a/.gitlab/ci/pipelines/octez_release_tag_test.yml b/.gitlab/ci/pipelines/octez_release_tag_test.yml index e50e63508118..8e952693dab2 100644 --- a/.gitlab/ci/pipelines/octez_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml @@ -73,7 +73,7 @@ oc.build:static-x86_64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp + - gcp_very_high_cpu needs: - oc.docker:ci:amd64 dependencies: diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index 8fb3e8b8c160..0beea393290d 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -388,7 +388,7 @@ oc.build:static-x86_64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp + - gcp_very_high_cpu rules: - when: always dependencies: @@ -490,7 +490,7 @@ oc.build_x86_64-exp-dev-extra: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp_high_cpu + - gcp_very_high_cpu rules: - when: always dependencies: @@ -866,7 +866,7 @@ build-layer1-profiling: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp + - gcp_very_high_cpu dependencies: - oc.docker:ci:amd64 timeout: 60 minutes @@ -1820,7 +1820,7 @@ oc.script:snapshot_alpha_and_link: image: ${ci_image_name}/build:${ci_image_tag} stage: test tags: - - gcp + - gcp_very_high_cpu rules: - when: always dependencies: diff --git a/.gitlab/ci/pipelines/schedule_master_test_release.yml b/.gitlab/ci/pipelines/schedule_master_test_release.yml index 01f2031d45cc..041d159fb66d 100644 --- a/.gitlab/ci/pipelines/schedule_master_test_release.yml +++ b/.gitlab/ci/pipelines/schedule_master_test_release.yml @@ -72,7 +72,7 @@ oc.build:static-x86_64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} stage: build tags: - - gcp + - gcp_very_high_cpu needs: - oc.docker:ci:amd64 dependencies: diff --git a/ci/bin/code_verification.ml b/ci/bin/code_verification.ml index ba11dc6c1caf..3eb47b220cf4 100644 --- a/ci/bin/code_verification.ml +++ b/ci/bin/code_verification.ml @@ -605,7 +605,7 @@ let jobs pipeline_type = job_build_dynamic_binaries ~__POS__ ~arch:Amd64 - ~cpu:High + ~cpu:Very_high ~retry: {max = 2; when_ = [Stuck_or_timeout_failure; Runner_system_failure]} ~dependencies:dependencies_needs_start @@ -651,6 +651,7 @@ let jobs pipeline_type = job_build_static_binaries ~__POS__ ~arch:Amd64 + ~cpu:Very_high (* Even though not many tests depend on static executables, some of those that do are limiting factors in the total duration of pipelines. So we start this job as early as possible, @@ -1196,6 +1197,7 @@ let jobs pipeline_type = ~name:"oc.script:snapshot_alpha_and_link" ~stage:Stages.test ~image:Images.CI.build + ~cpu:Very_high ~dependencies:order_after_build (* Since the above dependencies are only for ordering, we do not set [dependent] *) ~rules:(make_rules ~changes:changeset_script_snapshot_alpha_and_link ()) diff --git a/ci/bin/common.ml b/ci/bin/common.ml index 6089251d4fa8..4e5d2e37a2e3 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -947,6 +947,7 @@ let job_build_layer1_profiling ?(expire_in = Duration (Days 1)) () = ~stage:Stages.build ~image:Images.CI.build ~name:"build-layer1-profiling" + ~cpu:Very_high ~artifacts:(artifacts ~expire_in ["./octez-binaries/x86_64/octez-node"]) ~before_script: (before_script diff --git a/ci/bin/master_branch.ml b/ci/bin/master_branch.ml index 4dd6e5b56c1c..d877cd828ddd 100644 --- a/ci/bin/master_branch.ml +++ b/ci/bin/master_branch.ml @@ -56,7 +56,7 @@ let jobs = job_build_static_binaries ~__POS__ ~arch:Amd64 - ~cpu:Normal + ~cpu:Very_high ~rules:rules_always () in diff --git a/ci/bin/release_tag.ml b/ci/bin/release_tag.ml index 79c56bfc80f7..b93cd9d5f25e 100644 --- a/ci/bin/release_tag.ml +++ b/ci/bin/release_tag.ml @@ -104,6 +104,7 @@ let octez_jobs ?(test = false) release_tag_pipeline_type = ~dependencies:(Dependent []) ~__POS__ ~arch:Amd64 + ~cpu:Very_high ~release:true () in @@ -292,6 +293,7 @@ let octez_evm_node_jobs ?(test = false) () = job_build_static_binaries ~__POS__ ~arch:Amd64 + ~cpu:Very_high ~executable_files:"script-inputs/octez-evm-node-executable" ~release:true ~version_executable:"octez-evm-node" -- GitLab