diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index c74ca103649a55c21774a5ddf978f2493fc1173e..cee11f98c72ef5fe9823ffb694eb9eab0d5a732f 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 c0472bc11dfc86dc1be0e475b4afa9272ba03896..6733752396836bca872509a24f47ea7b458f7997 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 b757d42ad7b540f937054dbb90741eade6f6f6c1..2075ff9d5298f0619a29f9b252335f8288334312 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 2353f16ca72be4ca82e11747fbf3163dbb0db91c..1666a2018288ec162be7a7b6b8f412bbb98e486a 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 bc6484f91897408d3d5b5d0c36b9fa25cb0e46ad..270d7ef24780d011e49758cc4088ddae4c76fa4f 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 f4e02d6331dac7da035eb287570d8e955952827d..c68380a7962660ad29e16c72954cce28e4386ed7 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 5ec9e9eb40e0534b769888d6622e569e408b2a15..feffa02bfe777d511a341320921a10ab6cc26257 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 90969499bc34774783fb005f1082093145db99ef..b2b34c385b2575128310773a6718639fa7176a4d 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 ca32e55d5807ffc1b36d083c04d2c52dc00916bd..4fc1dfea454df4848d0a1953ea58de57350467c5 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 e50e63508118341371494f335101a9b95e505c06..8e952693dab21c5f4cd5482436c15664301131ec 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 8fb3e8b8c1609bcb8564f48a82c41f8230e943b1..0beea393290db9fa3237e01763ad15e1c1a65c31 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 01f2031d45cc6ce667ead920a785a6fff0d96f83..041d159fb66d88334d974e39850ca9ce176e1b2e 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 ba11dc6c1cafbd3f271692b6244d09910aade03a..3eb47b220cf40c72ffb0d947b963714a58889b11 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 6089251d4fa82379d824de31593ea240934793ae..4e5d2e37a2e30aca787a738a9f37be57aee62e2f 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 4dd6e5b56c1cbe7eb54e6e56948b4c7faec5aaea..d877cd828ddd2e358226d64b0676e8c40d0b2e45 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 79c56bfc80f704e42cf0ec3d5a3ee0270958b080..b93cd9d5f25e8c7df76f922895f83314ed3f39d1 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"