diff --git a/.gitlab/ci/jobs/build/arm64.yml b/.gitlab/ci/jobs/build/arm64.yml index 297ab7178727be74991a876dadf7c21ca538e93a..fa39abd97d85a72ea6565902b72f29699ddde710 100644 --- a/.gitlab/ci/jobs/build/arm64.yml +++ b/.gitlab/ci/jobs/build/arm64.yml @@ -2,6 +2,7 @@ include: .gitlab/ci/jobs/build/common.yml .build_arm64: extends: + - .tags_template__build_arm64 - .build variables: ARCH: "arm64" @@ -15,14 +16,13 @@ include: .gitlab/ci/jobs/build/common.yml when: on_success - when: manual allow_failure: true - tags: - - arm64 # The build_arm64 jobs are split in two to keep the artifact size # under the 1GB hard limit set by GitLab. # 'build_arm64-released' builds the released executables. build_arm64-released: - extends: .build_arm64 + extends: + - .build_arm64 variables: EXECUTABLE_FILES: "script-inputs/released-executables" @@ -30,7 +30,8 @@ build_arm64-released: # executables, as well as the tezt test suite and the TPS evaluation # tool. build_arm64-exp-dev-extra: - extends: .build_arm64 + extends: + - .build_arm64 variables: EXECUTABLE_FILES: "script-inputs/experimental-executables script-inputs/dev-executables" BUILD_EXTRA: "src/bin_tps_evaluation/main_tps_evaluation.exe tezt/tests/main.exe" diff --git a/.gitlab/ci/jobs/build/check.yml b/.gitlab/ci/jobs/build/check.yml index a3a6992edffd50275c1629e36a49d320a3ebdb27..c0982bf97546e54413c1512d939d0f493158767f 100644 --- a/.gitlab/ci/jobs/build/check.yml +++ b/.gitlab/ci/jobs/build/check.yml @@ -1,5 +1,6 @@ ocaml-check: extends: + - .tags_template__build - .build needs: [trigger] script: diff --git a/.gitlab/ci/jobs/build/docker_amd64_experimental.yml b/.gitlab/ci/jobs/build/docker_amd64_experimental.yml index 52fd82b428cd99fdfc8f0032e8798f64c5d7ea97..f5c9d9e7216e3cd280d504040cf79f9a4fd19ea1 100644 --- a/.gitlab/ci/jobs/build/docker_amd64_experimental.yml +++ b/.gitlab/ci/jobs/build/docker_amd64_experimental.yml @@ -2,6 +2,7 @@ include: .gitlab/ci/jobs/build/common.yml docker:amd64: extends: + - .tags_template__build - .build_docker_release_template variables: DOCKER_BUILD_TARGET: "with-evm-artifacts" diff --git a/.gitlab/ci/jobs/build/docker_amd64_release.yml b/.gitlab/ci/jobs/build/docker_amd64_release.yml index 7f7544a5fe904f7db8eb4b87fc23063dc3d7cf46..e9cca0712e3499fb0f170c3ce07791b5109e1bd1 100644 --- a/.gitlab/ci/jobs/build/docker_amd64_release.yml +++ b/.gitlab/ci/jobs/build/docker_amd64_release.yml @@ -2,6 +2,7 @@ include: .gitlab/ci/jobs/build/common.yml docker:amd64: extends: + - .tags_template__build - .build_docker_release_template variables: IMAGE_ARCH_PREFIX: "amd64_" diff --git a/.gitlab/ci/jobs/build/docker_amd64_test.yml b/.gitlab/ci/jobs/build/docker_amd64_test.yml index 590ee301acb40236f36ca522611cf217caeba3bf..3a9f08adb21c444c957207e04fe828a171c9bb67 100644 --- a/.gitlab/ci/jobs/build/docker_amd64_test.yml +++ b/.gitlab/ci/jobs/build/docker_amd64_test.yml @@ -2,6 +2,7 @@ include: .gitlab/ci/jobs/build/common.yml docker:amd64: extends: + - .tags_template__build - .build_docker_release_template variables: IMAGE_ARCH_PREFIX: "amd64_" diff --git a/.gitlab/ci/jobs/build/docker_arm64_experimental.yml b/.gitlab/ci/jobs/build/docker_arm64_experimental.yml index 952107cfe355fe11a76bdeb63355c58497bd134b..6f192ef78f3a6a04d31c18a2cdcfdcacf0950032 100644 --- a/.gitlab/ci/jobs/build/docker_arm64_experimental.yml +++ b/.gitlab/ci/jobs/build/docker_arm64_experimental.yml @@ -2,11 +2,10 @@ include: .gitlab/ci/jobs/build/common.yml docker:arm64: extends: + - .tags_template__build_arm64 - .build_docker_release_template stage: build variables: IMAGE_ARCH_PREFIX: "arm64_" CI_DOCKER_HUB: "true" EXECUTABLE_FILES: "script-inputs/released-executables script-inputs/experimental-executables" - tags: - - arm64 \ No newline at end of file diff --git a/.gitlab/ci/jobs/build/docker_arm64_release.yml b/.gitlab/ci/jobs/build/docker_arm64_release.yml index d154e617810b8637870316948706c4d276861736..e4d18d951a8c51b58e51a7fac6fc4333a1010fb2 100644 --- a/.gitlab/ci/jobs/build/docker_arm64_release.yml +++ b/.gitlab/ci/jobs/build/docker_arm64_release.yml @@ -2,11 +2,10 @@ include: .gitlab/ci/jobs/build/common.yml docker:arm64: extends: + - .tags_template__build_arm64 - .build_docker_release_template stage: build variables: IMAGE_ARCH_PREFIX: "arm64_" CI_DOCKER_HUB: "true" EXECUTABLE_FILES: "script-inputs/released-executables" - tags: - - arm64 \ No newline at end of file diff --git a/.gitlab/ci/jobs/build/docker_arm64_test.yml b/.gitlab/ci/jobs/build/docker_arm64_test.yml index 0e565dcec7609e2cf45f94247905ecf231974855..03f2b60b0dbcb460db34d2333d034581ef448792 100644 --- a/.gitlab/ci/jobs/build/docker_arm64_test.yml +++ b/.gitlab/ci/jobs/build/docker_arm64_test.yml @@ -2,11 +2,10 @@ include: .gitlab/ci/jobs/build/common.yml docker:arm64: extends: + - .tags_template__build_arm64 - .build_docker_release_template stage: build variables: IMAGE_ARCH_PREFIX: "arm64_" CI_DOCKER_HUB: "false" EXECUTABLE_FILES: "script-inputs/released-executables script-inputs/experimental-executables" - tags: - - arm64 \ No newline at end of file diff --git a/.gitlab/ci/jobs/build/get_contracts.yml b/.gitlab/ci/jobs/build/get_contracts.yml index 2d029b09fe4bcca0df1a61c405521a1a7d328ce8..2d1ea6497ca753a639bdd5e68688dd776e2e0551 100644 --- a/.gitlab/ci/jobs/build/get_contracts.yml +++ b/.gitlab/ci/jobs/build/get_contracts.yml @@ -2,6 +2,7 @@ include: .gitlab/ci/jobs/build/common.yml build_get_contracts: extends: + - .tags_template__build - .build_template script: - dune build @devtools/get_contracts/check diff --git a/.gitlab/ci/jobs/build/kernels.yml b/.gitlab/ci/jobs/build/kernels.yml index 0308d8669c3c85225a3f33f9e09499344df87ebf..7495d0da7ec431f00e558c814a59e482a5368d94 100644 --- a/.gitlab/ci/jobs/build/kernels.yml +++ b/.gitlab/ci/jobs/build/kernels.yml @@ -1,5 +1,6 @@ build_kernels: extends: + - .tags_template__build - .kernels_template stage: build needs: [trigger] diff --git a/.gitlab/ci/jobs/build/static_arm64_experimental.yml b/.gitlab/ci/jobs/build/static_arm64_experimental.yml index 52c239152c48317ad51dd84bb077cf5ff79d9d90..cc6eb8697db8adb66fb54138310d428f1801d991 100644 --- a/.gitlab/ci/jobs/build/static_arm64_experimental.yml +++ b/.gitlab/ci/jobs/build/static_arm64_experimental.yml @@ -3,9 +3,8 @@ include: .gitlab/ci/jobs/build/common.yml # See comments in static_x86_64_experimental.yml. build:static-arm64-linux-binaries: extends: + - .tags_template__build_arm64 - .build_static_binaries_template variables: ARCH: "arm64" EXECUTABLE_FILES: "script-inputs/released-executables script-inputs/experimental-executables" - tags: - - arm64 diff --git a/.gitlab/ci/jobs/build/static_arm64_release.yml b/.gitlab/ci/jobs/build/static_arm64_release.yml index 81becf4d396d219aed8a46a5413e380669e7110f..4ce71cb04dfea3c2d9eac572d022dc79fcbc52d5 100644 --- a/.gitlab/ci/jobs/build/static_arm64_release.yml +++ b/.gitlab/ci/jobs/build/static_arm64_release.yml @@ -3,9 +3,8 @@ include: .gitlab/ci/jobs/build/common.yml # See comments in static_x86_64_experimental.yml. build:static-arm64-linux-binaries: extends: + - .tags_template__build_arm64 - .build_static_binaries_template variables: ARCH: "arm64" EXECUTABLE_FILES: "script-inputs/released-executables" - tags: - - arm64 diff --git a/.gitlab/ci/jobs/build/static_x86_64_experimental.yml b/.gitlab/ci/jobs/build/static_x86_64_experimental.yml index 475930848e82613f5956104d9647cd70aaacc4a7..22f36ea956919c23ba73beb9df6c3151a48d0957 100644 --- a/.gitlab/ci/jobs/build/static_x86_64_experimental.yml +++ b/.gitlab/ci/jobs/build/static_x86_64_experimental.yml @@ -12,6 +12,7 @@ include: .gitlab/ci/jobs/build/common.yml # (they do not build experimental executables) build:static-x86_64-linux-binaries: extends: + - .tags_template__build - .build_static_binaries_template # Even though not many tests depend on static executables, some of those that do # are limiting factors in the total duration of pipelines. diff --git a/.gitlab/ci/jobs/build/static_x86_64_release.yml b/.gitlab/ci/jobs/build/static_x86_64_release.yml index 181fde40509694058a50f9b0aff64c40caeb626f..06302d00600ab1f3b684ea9761bdfae1778087ae 100644 --- a/.gitlab/ci/jobs/build/static_x86_64_release.yml +++ b/.gitlab/ci/jobs/build/static_x86_64_release.yml @@ -3,6 +3,7 @@ include: .gitlab/ci/jobs/build/common.yml # See comments in static_x86_64_experimental.yml. build:static-x86_64-linux-binaries: extends: + - .tags_template__build - .build_static_binaries_template needs: [trigger] variables: diff --git a/.gitlab/ci/jobs/build/tezt_fetch_records.yml b/.gitlab/ci/jobs/build/tezt_fetch_records.yml index 773cb59b62933c7283a308d5c797e8de80cff478..4cf2d96ea2cf6f0cb908a20c9faf1b98a5956fc5 100644 --- a/.gitlab/ci/jobs/build/tezt_fetch_records.yml +++ b/.gitlab/ci/jobs/build/tezt_fetch_records.yml @@ -3,6 +3,7 @@ # for future merge request pipelines. tezt:fetch-records: extends: + - .tags_template__build - .build_template stage: build script: diff --git a/.gitlab/ci/jobs/build/x86_64.yml b/.gitlab/ci/jobs/build/x86_64.yml index e11e19d5b7b2a1a948d96e57ef8dc3ca11db9da1..1e73d926e6d75530ffd0a46d07dd050c7b31bdfb 100644 --- a/.gitlab/ci/jobs/build/x86_64.yml +++ b/.gitlab/ci/jobs/build/x86_64.yml @@ -13,7 +13,9 @@ include: .gitlab/ci/jobs/build/common.yml # under the 1GB hard limit set by GitLab. # 'build_x86_64-released' builds the released executables. build_x86_64-released: - extends: .build_x86_64 + extends: + - .tags_template__build + - .build_x86_64 variables: EXECUTABLE_FILES: "script-inputs/released-executables" @@ -21,7 +23,9 @@ build_x86_64-released: # executables, as well as the tezt test suite used by the subsequent # 'tezt' jobs and TPS evaluation tool. build_x86_64-exp-dev-extra: - extends: .build_x86_64 + extends: + - .tags_template__build + - .build_x86_64 variables: EXECUTABLE_FILES: "script-inputs/experimental-executables script-inputs/dev-executables" BUILD_EXTRA: "src/bin_tps_evaluation/main_tps_evaluation.exe tezt/tests/main.exe" diff --git a/.gitlab/ci/jobs/doc/build_all.yml b/.gitlab/ci/jobs/doc/build_all.yml index 83e9477deb022f7152502e5e04af3ec081fd82d9..17f4f91ecee2695bf71aa69d4b1d04ab93bdb586 100644 --- a/.gitlab/ci/jobs/doc/build_all.yml +++ b/.gitlab/ci/jobs/doc/build_all.yml @@ -6,6 +6,7 @@ documentation:build_all: extends: - .default_settings_template - .image_template__runtime_build_test_dependencies_template + - .tags_template__build stage: build needs: [trigger] before_script: diff --git a/.gitlab/ci/jobs/shared/templates.yml b/.gitlab/ci/jobs/shared/templates.yml index 6042e1e609dfb88482fe9178eef053f1ad47c333..75e6d8a1a5e032bd4dec57668687609dadb397b3 100644 --- a/.gitlab/ci/jobs/shared/templates.yml +++ b/.gitlab/ci/jobs/shared/templates.yml @@ -8,6 +8,14 @@ # their dependencies locally. dependencies: [] +# Default runner tags for jobs in the build stage +.tags_template__build: + tags: [] + +# Default runner tags for arm64 jobs in the build stage +.tags_template__build_arm64: + tags: ["arm64"] + # Add variables for bisect_ppx instrumentation .template__coverage: variables: