diff --git a/.gitlab/ci/jobs/build/arm64.yml b/.gitlab/ci/jobs/build/arm64.yml index 297ab7178727be74991a876dadf7c21ca538e93a..b2e3e5237fb1c80265de69325ff3ee9d9a6929a6 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,8 +16,6 @@ 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. 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_amd64_test_manual.yml b/.gitlab/ci/jobs/build/docker_amd64_test_manual.yml index 4d844c0230dbcae99aa3d98066eebbe6ec6dbf01..bf20b0a9b1b071e481e8adefb12c49fa3d16ba99 100644 --- a/.gitlab/ci/jobs/build/docker_amd64_test_manual.yml +++ b/.gitlab/ci/jobs/build/docker_amd64_test_manual.yml @@ -2,6 +2,7 @@ include: .gitlab/ci/jobs/build/common.yml docker:amd64: extends: + - .tags_template__default - .build_docker_release_template stage: manual needs: [] 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/docker_arm64_test_manual.yml b/.gitlab/ci/jobs/build/docker_arm64_test_manual.yml index 08506ee9974045df6c2b7183ba663b38de48a14a..87966fa55262c6f431569d54d0f3dd053c2c66cb 100644 --- a/.gitlab/ci/jobs/build/docker_arm64_test_manual.yml +++ b/.gitlab/ci/jobs/build/docker_arm64_test_manual.yml @@ -2,6 +2,7 @@ include: .gitlab/ci/jobs/build/common.yml docker:arm64: extends: + - .tags_template__arm64 - .build_docker_release_template stage: manual needs: [] @@ -11,5 +12,3 @@ docker:arm64: CI_DOCKER_HUB: "false" EXECUTABLE_FILES: "script-inputs/released-executables script-inputs/experimental-executables" allow_failure: true - tags: - - arm64 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/coverage/coverage.yml b/.gitlab/ci/jobs/coverage/coverage.yml index bd3ffb560e169c842afa2c77b8be845f81784e0e..2aa4ce7d24bd5bcf0ba15fdc18b6975943147949 100644 --- a/.gitlab/ci/jobs/coverage/coverage.yml +++ b/.gitlab/ci/jobs/coverage/coverage.yml @@ -8,6 +8,7 @@ unified_coverage: extends: - .default_settings_template - .image_template__runtime_build_test_dependencies_template + - .tags_template__default - .template__coverage_report rules: # We do not run this job when margebot triggers the diff --git a/.gitlab/ci/jobs/coverage/coverage_default.yml b/.gitlab/ci/jobs/coverage/coverage_default.yml index 849fbb3bd0a68ce8321ae65b8694f90242668545..8fd381914467cef5ddb106a2b3d5f8bb1ec196f3 100644 --- a/.gitlab/ci/jobs/coverage/coverage_default.yml +++ b/.gitlab/ci/jobs/coverage/coverage_default.yml @@ -8,6 +8,7 @@ unified_coverage: extends: - .default_settings_template - .image_template__runtime_build_test_dependencies_template + - .tags_template__default - .template__coverage_report dependencies: [] variables: 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/doc/linkcheck.yml b/.gitlab/ci/jobs/doc/linkcheck.yml index 8cd8091fbc0b1e26e558bafcb32f7b78745e82dd..82df8408ce6fd4d5e95719ae7aa1f213de2ea722 100644 --- a/.gitlab/ci/jobs/doc/linkcheck.yml +++ b/.gitlab/ci/jobs/doc/linkcheck.yml @@ -2,6 +2,7 @@ documentation:linkcheck: extends: - .default_settings_template - .image_template__runtime_build_test_dependencies_template + - .tags_template__default stage: doc needs: [] rules: diff --git a/.gitlab/ci/jobs/doc/publish.yml b/.gitlab/ci/jobs/doc/publish.yml index 92def03e326b81550f1a0eb64fddaad7e5c19267..2895318477f2f3cd7fc6ccf1e8a3be2dcf7d2eb5 100644 --- a/.gitlab/ci/jobs/doc/publish.yml +++ b/.gitlab/ci/jobs/doc/publish.yml @@ -11,6 +11,7 @@ publish:documentation: extends: - .default_settings_template - .image_template__runtime_build_test_dependencies_template + - .tags_template__default stage: doc # Make the publish_documentation run in the beginning of the master # pipeline to ensure it has time to run before the next merge. diff --git a/.gitlab/ci/jobs/doc/tests.yml b/.gitlab/ci/jobs/doc/tests.yml index f011f72d0bd8b89af0c6e89cf61c04df9ade6a9c..3cefb2e26573c6da10d15295980d3cb6eb56257f 100644 --- a/.gitlab/ci/jobs/doc/tests.yml +++ b/.gitlab/ci/jobs/doc/tests.yml @@ -1,4 +1,7 @@ .base-test-doc-scripts-template: + extends: + - .default_settings_template + - .tags_template__default stage: doc needs: [] rules: @@ -29,9 +32,7 @@ exit_codes: 137 .install_bin_ubuntu_template: - extends: - - .default_settings_template - - .base-test-doc-scripts-template + extends: .base-test-doc-scripts-template script: - ./docs/introduction/install-bin-ubuntu.sh @@ -44,9 +45,7 @@ install_bin_focal: extends: .install_bin_ubuntu_template .install_bin_rc_ubuntu_template: - extends: - - .default_settings_template - - .base-test-doc-scripts-template + extends: .base-test-doc-scripts-template script: - ./docs/introduction/install-bin-ubuntu.sh rc @@ -59,9 +58,7 @@ install_bin_rc_focal: extends: .install_bin_rc_ubuntu_template .install_bin_fedora_template: - extends: - - .default_settings_template - - .base-test-doc-scripts-template + extends: .base-test-doc-scripts-template script: - ./docs/introduction/install-bin-fedora.sh @@ -70,9 +67,7 @@ install_bin_fedora_36: extends: .install_bin_fedora_template .install_bin_rc_fedora_template: - extends: - - .default_settings_template - - .base-test-doc-scripts-template + extends: .base-test-doc-scripts-template script: - ./docs/introduction/install-bin-fedora.sh rc @@ -81,9 +76,7 @@ install_bin_rc_fedora_36: extends: .install_bin_rc_fedora_template .install_opam_ubuntu_template: - extends: - - .default_settings_template - - .base-test-doc-scripts-template + extends: .base-test-doc-scripts-template script: - ./docs/introduction/install-opam.sh @@ -96,9 +89,7 @@ install_opam_focal: extends: .install_opam_ubuntu_template .compile_sources_template: - extends: - - .default_settings_template - - .base-test-doc-scripts-template + extends: .base-test-doc-scripts-template compile_release_sources_buster: image: ocaml/opam:debian-10 @@ -113,9 +104,7 @@ compile_sources_buster: - ./docs/introduction/compile-sources.sh ${CI_MERGE_REQUEST_SOURCE_PROJECT_PATH:-tezos/tezos} ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-master} .install_python_debian_ubuntu_template: - extends: - - .default_settings_template - - .base-test-doc-scripts-template + extends: .base-test-doc-scripts-template script: - ./docs/developer/install-python-debian-ubuntu.sh ${CI_MERGE_REQUEST_SOURCE_PROJECT_PATH:-tezos/tezos} ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-master} diff --git a/.gitlab/ci/jobs/packaging/opam_prepare.yml b/.gitlab/ci/jobs/packaging/opam_prepare.yml index 39331f13159f5a6d29aa9c28ba2048e1df70dde5..49db12757265a04f24348e4aa4c9e47f11c8871f 100644 --- a/.gitlab/ci/jobs/packaging/opam_prepare.yml +++ b/.gitlab/ci/jobs/packaging/opam_prepare.yml @@ -4,6 +4,7 @@ extends: - .default_settings_template - .image_template__runtime_prebuild_dependencies_template + - .tags_template__default stage: packaging # FIXME: https://gitlab.com/nomadic-labs/tezos/-/issues/663 # FIXME: https://gitlab.com/nomadic-labs/tezos/-/issues/664 @@ -30,6 +31,7 @@ opam:prepare: extends: - .default_settings_template - .image_template__runtime_prebuild_dependencies_template + - .tags_template__default - .rules_template__trigger_exec_opam_batch_1 stage: packaging needs: [trigger] diff --git a/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_release.yml b/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_release.yml index 9f645d7e8e9de7a9e70d6bfa8d60ec0d86cf5d5c..a339140d43db383b535125cfa9aa6f5d5e5305b6 100644 --- a/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_release.yml +++ b/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_release.yml @@ -7,6 +7,7 @@ include: .gitlab/ci/jobs/publish/common.yml docker:merge_manifests: extends: - .image_template__docker + - .tags_template__default stage: prepare_release variables: CI_DOCKER_HUB: "true" diff --git a/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_test.yml b/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_test.yml index fecff647b86cdb55e69221b80f2ee3560f6948d5..bbe434a96430a5d230a6931937aa86cf52838024 100644 --- a/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_test.yml +++ b/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_test.yml @@ -7,6 +7,7 @@ include: .gitlab/ci/jobs/publish/common.yml docker:merge_manifests: extends: - .image_template__docker + - .tags_template__default stage: prepare_release variables: CI_DOCKER_HUB: "false" diff --git a/.gitlab/ci/jobs/publish/common.yml b/.gitlab/ci/jobs/publish/common.yml index 292fc0b355609c2b8846fb2cc0ae18974abf72f8..b6286d64ff53822bd607763699434000370a8d3f 100644 --- a/.gitlab/ci/jobs/publish/common.yml +++ b/.gitlab/ci/jobs/publish/common.yml @@ -12,6 +12,8 @@ # - https://docs.gitlab.com/ee/ci/cloud_services/aws/index.html .build_deb_packages: + extends: + - .tags_template__default stage: publish_release image: ${CI_REGISTRY}/tezos/docker-images/ci-package:latest-ubuntu@sha256:76c894f509b84e106c9d056882c63cb497a2778f7c7dbbd1c73abe2568ee446e needs: @@ -35,6 +37,8 @@ - ./scripts/ci/upload_linux_package.sh .build_rpm_packages: + extends: + - .tags_template__default stage: publish_release image: ${CI_REGISTRY}/tezos/docker-images/ci-package:latest-fedora@sha256:35bfacc001e4c5247679e2f79c36ab1c83bd893a1e909c5c1afd1beff44c6895 needs: diff --git a/.gitlab/ci/jobs/publish/docker_promote_to_latest_release.yml b/.gitlab/ci/jobs/publish/docker_promote_to_latest_release.yml index 2bf1ba7a69001266a94ebc2e22af312dad4565ed..27d53a7680fe02d2d736794de514e67895f84abb 100644 --- a/.gitlab/ci/jobs/publish/docker_promote_to_latest_release.yml +++ b/.gitlab/ci/jobs/publish/docker_promote_to_latest_release.yml @@ -3,6 +3,7 @@ include: .gitlab/ci/jobs/publish/common.yml docker:promote_to_latest: extends: - .image_template__docker + - .tags_template__default stage: publish_release variables: CI_DOCKER_HUB: "true" diff --git a/.gitlab/ci/jobs/publish/docker_promote_to_latest_test.yml b/.gitlab/ci/jobs/publish/docker_promote_to_latest_test.yml index b6dd6413efc88c7c204d7caedbbdc530096e026b..718cc218fc2f4faf84b467d41597eb1dc76a4876 100644 --- a/.gitlab/ci/jobs/publish/docker_promote_to_latest_test.yml +++ b/.gitlab/ci/jobs/publish/docker_promote_to_latest_test.yml @@ -3,10 +3,11 @@ include: .gitlab/ci/jobs/publish/common.yml docker:promote_to_latest: extends: - .image_template__docker + - .tags_template__default stage: publish_release variables: CI_DOCKER_HUB: "false" before_script: - ./scripts/ci/docker_registry_auth.sh script: - - ./scripts/ci/docker_promote_to_latest.sh \ No newline at end of file + - ./scripts/ci/docker_promote_to_latest.sh diff --git a/.gitlab/ci/jobs/publish/gitlab.yml b/.gitlab/ci/jobs/publish/gitlab.yml index e2446314334a9294bd446bf8c7ea82fe67575212..21851c2155f7ae4336016b51b38034ae3016bbc1 100644 --- a/.gitlab/ci/jobs/publish/gitlab.yml +++ b/.gitlab/ci/jobs/publish/gitlab.yml @@ -2,6 +2,8 @@ include: .gitlab/ci/jobs/publish/common.yml gitlab:release: # https://gitlab.com/tezos/docker-images/ci-release + extends: + - .tags_template__default image: "${CI_REGISTRY}/tezos/docker-images/ci-release:v1.1.0" stage: publish_release_gitlab # Publish jobs are uninterruptible to avoid publishing partial results. diff --git a/.gitlab/ci/jobs/publish/kernel_sdk.yml b/.gitlab/ci/jobs/publish/kernel_sdk.yml index 152fa06a8bf29cb16b3a86a4e2eaccf06a38dae2..19b62976e6a3c4702afbad1490299ad7e077a860 100644 --- a/.gitlab/ci/jobs/publish/kernel_sdk.yml +++ b/.gitlab/ci/jobs/publish/kernel_sdk.yml @@ -6,6 +6,7 @@ publish_kernel_sdk: extends: - .default_settings_template + - .tags_template__default stage: manual image: "${PROD_AWS_ECR}/rust-toolchain:v1.0.3" rules: diff --git a/.gitlab/ci/jobs/publish/opam.yml b/.gitlab/ci/jobs/publish/opam.yml index a61df2437deb46442c733f7a4cae5deff67a0ac8..44311f79699710ead5232f68110ac1a4f25aad90 100644 --- a/.gitlab/ci/jobs/publish/opam.yml +++ b/.gitlab/ci/jobs/publish/opam.yml @@ -3,6 +3,7 @@ include: .gitlab/ci/jobs/publish/common.yml opam:release: extends: - .image_template__runtime_build_test_dependencies_template + - .tags_template__default stage: publish_release # Publish jobs are uninterruptible to avoid publishing partial results. interruptible: false diff --git a/.gitlab/ci/jobs/sanity/docker_hadolint.yml b/.gitlab/ci/jobs/sanity/docker_hadolint.yml index 3a1cf7db927d4f07a1c929169ce6bb6e1ff79514..e50ccdb725521e94cf6a79a28e2cf1e268a0f316 100644 --- a/.gitlab/ci/jobs/sanity/docker_hadolint.yml +++ b/.gitlab/ci/jobs/sanity/docker_hadolint.yml @@ -1,6 +1,7 @@ docker:hadolint: extends: - .default_settings_template + - .tags_template__default image: hadolint/hadolint:2.9.3-debian stage: sanity rules: diff --git a/.gitlab/ci/jobs/sanity/sanity_ci.yml b/.gitlab/ci/jobs/sanity/sanity_ci.yml index b20a46426632cee317c06f399582563c4bd15b3c..12fd115cded8e21bb190905d7febd754c8fb686d 100644 --- a/.gitlab/ci/jobs/sanity/sanity_ci.yml +++ b/.gitlab/ci/jobs/sanity/sanity_ci.yml @@ -2,6 +2,7 @@ sanity_ci: extends: - .default_settings_template - .image_template__runtime_build_test_dependencies_template + - .tags_template__default stage: sanity script: - make -C ${CI_PROJECT_DIR}/.gitlab/ci sanity-ci diff --git a/.gitlab/ci/jobs/shared/templates.yml b/.gitlab/ci/jobs/shared/templates.yml index 6042e1e609dfb88482fe9178eef053f1ad47c333..abadf57abefaa4e39f4bbd81e593cc9c8ebbbacd 100644 --- a/.gitlab/ci/jobs/shared/templates.yml +++ b/.gitlab/ci/jobs/shared/templates.yml @@ -8,6 +8,23 @@ # their dependencies locally. dependencies: [] +# Use this template to add specific tags to the +# non-build/non-arm64/non-build_arm64 jobs only +.tags_template__default: + tags: [] + +# Default runner tags for jobs in the build stage +.tags_template__build: + tags: [] + +# Default runner tags for arm64 jobs +.tags_template__arm64: + tags: ["arm64"] + +# 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: diff --git a/.gitlab/ci/jobs/test/check_scripts.yml b/.gitlab/ci/jobs/test/check_scripts.yml index 90c769016cb76d425c590f323944bc21131ac423..971d3aebf5661fd5cfcdfa66d15249670b78526e 100644 --- a/.gitlab/ci/jobs/test/check_scripts.yml +++ b/.gitlab/ci/jobs/test/check_scripts.yml @@ -8,6 +8,7 @@ script:snapshot_alpha_and_link: extends: - .default_settings_template - .image_template__runtime_build_test_dependencies_template + - .tags_template__default stage: test before_script: - . ./scripts/version.sh @@ -33,6 +34,7 @@ script:test-gen-genesis: extends: - .default_settings_template - .image_template__runtime_build_test_dependencies_template + - .tags_template__default stage: test needs: [trigger] before_script: diff --git a/.gitlab/ci/jobs/test/common.yml b/.gitlab/ci/jobs/test/common.yml index 8a6e9590f4e20240acd9e945e119e054df50f0fa..6b2f99e11605b005f5ddff6c66bae46bcb00ae92 100644 --- a/.gitlab/ci/jobs/test/common.yml +++ b/.gitlab/ci/jobs/test/common.yml @@ -6,6 +6,7 @@ extends: - .default_settings_template - .image_template__runtime_build_test_dependencies_template + - .tags_template__default - .template__coverage stage: test before_script: diff --git a/.gitlab/ci/jobs/test/ometrics_code_quality.yml b/.gitlab/ci/jobs/test/ometrics_code_quality.yml index 26ab7715bf3875bedcc69c04307fc7f3c690e9ee..635c48c1b1ee16fbc4cdc305a7b5029626403db1 100644 --- a/.gitlab/ci/jobs/test/ometrics_code_quality.yml +++ b/.gitlab/ci/jobs/test/ometrics_code_quality.yml @@ -5,6 +5,7 @@ ometrics-code-quality: extends: - .default_settings_template - .image_template__runtime_build_test_dependencies_template + - .tags_template__default - .template__code_quality needs: [trigger] allow_failure: true diff --git a/.gitlab/ci/jobs/test/ometrics_code_quality_default.yml b/.gitlab/ci/jobs/test/ometrics_code_quality_default.yml index aa01c8b261d626189d3d8f04ef58627a82029554..8374d7da3cef0060ae2e6535773ec703d507cd8a 100644 --- a/.gitlab/ci/jobs/test/ometrics_code_quality_default.yml +++ b/.gitlab/ci/jobs/test/ometrics_code_quality_default.yml @@ -3,6 +3,7 @@ include: .gitlab/ci/jobs/test/common.yml ometrics-code-quality-default: stage: test extends: + - .tags_template__default - .template__code_quality # See https://gitlab.com/gitlab-org/gitlab/-/issues/215279 # In short, GitLab requires a code quality report from the target branch. diff --git a/.gitlab/ci/jobs/test/semgrep.yml b/.gitlab/ci/jobs/test/semgrep.yml index 6532232b7193e2abf6377ab90e649c756e21fd61..f65a7c5b91f59c6160e0f2af3a390301ce65fa41 100644 --- a/.gitlab/ci/jobs/test/semgrep.yml +++ b/.gitlab/ci/jobs/test/semgrep.yml @@ -1,6 +1,7 @@ semgrep: extends: - .default_settings_template + - .tags_template__default # We specify the image by hash to avoid flakiness. Indeed, if we took the # latest release, then an update in the parser or analyser could result in new # errors being found even if the code doesn't change. This would place the diff --git a/.gitlab/ci/jobs/test/tezt.yml b/.gitlab/ci/jobs/test/tezt.yml index fe9140209c662abf1ca400f273b71323181e3c49..86c4334535617bed99921b18a1fade45a1bd2c0b 100644 --- a/.gitlab/ci/jobs/test/tezt.yml +++ b/.gitlab/ci/jobs/test/tezt.yml @@ -62,6 +62,7 @@ tezt:static-binaries: # Expansion of .integration_template but without coverage. - .default_settings_template - .image_template__runtime_build_test_dependencies_template + - .tags_template__default - .tezt_template dependencies: # Fetch src/proto_*/parameters/*.json and tezt/tests/main.exe from diff --git a/.gitlab/ci/jobs/test/tezt_build_long.yml b/.gitlab/ci/jobs/test/tezt_build_long.yml index 5b0c0b9ca762208a161cc88e64362f8f8e111daa..540f12dea2333248b118c0f50c14991db298cce5 100644 --- a/.gitlab/ci/jobs/test/tezt_build_long.yml +++ b/.gitlab/ci/jobs/test/tezt_build_long.yml @@ -2,6 +2,7 @@ # they can be built in the performance regression test framework executors. tezt:build-long: extends: + - .tags_template__default - .build_template stage: test script: diff --git a/.gitlab/ci/jobs/test/unit.yml b/.gitlab/ci/jobs/test/unit.yml index 46281698cc6b0c76bf2f647f0c1a935cdfa9915c..521eefee560dccb5dd166c26d65f135c10fd8595 100644 --- a/.gitlab/ci/jobs/test/unit.yml +++ b/.gitlab/ci/jobs/test/unit.yml @@ -36,7 +36,9 @@ - test_results .unit_test_template_arm64: - extends: .unit_test_template + extends: + - .tags_template__arm64 + - .unit_test_template needs: - "build_arm64-released" - "build_arm64-exp-dev-extra"