From f88e33e9c3e992dd227770d0fab2a5124c8aeb74 Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Wed, 21 Jun 2023 18:02:51 +0200
Subject: [PATCH 01/11] CI: add tag templates

---
 .gitlab/ci/jobs/shared/templates.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.gitlab/ci/jobs/shared/templates.yml b/.gitlab/ci/jobs/shared/templates.yml
index 6042e1e609df..abadf57abefa 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:
-- 
GitLab


From da1059b76844ad3190cb32c81efaed5da81cf528 Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Thu, 22 Jun 2023 14:08:27 +0200
Subject: [PATCH 02/11] CI: refactor tagging of all [build] jobs

---
 .gitlab/ci/jobs/build/arm64.yml                      | 3 +--
 .gitlab/ci/jobs/build/check.yml                      | 1 +
 .gitlab/ci/jobs/build/docker_amd64_experimental.yml  | 1 +
 .gitlab/ci/jobs/build/docker_amd64_release.yml       | 1 +
 .gitlab/ci/jobs/build/docker_amd64_test.yml          | 1 +
 .gitlab/ci/jobs/build/docker_amd64_test_manual.yml   | 1 +
 .gitlab/ci/jobs/build/docker_arm64_experimental.yml  | 3 +--
 .gitlab/ci/jobs/build/docker_arm64_release.yml       | 3 +--
 .gitlab/ci/jobs/build/docker_arm64_test.yml          | 3 +--
 .gitlab/ci/jobs/build/docker_arm64_test_manual.yml   | 3 +--
 .gitlab/ci/jobs/build/get_contracts.yml              | 1 +
 .gitlab/ci/jobs/build/kernels.yml                    | 1 +
 .gitlab/ci/jobs/build/static_arm64_experimental.yml  | 3 +--
 .gitlab/ci/jobs/build/static_arm64_release.yml       | 3 +--
 .gitlab/ci/jobs/build/static_x86_64_experimental.yml | 1 +
 .gitlab/ci/jobs/build/static_x86_64_release.yml      | 1 +
 .gitlab/ci/jobs/build/tezt_fetch_records.yml         | 1 +
 .gitlab/ci/jobs/build/x86_64.yml                     | 8 ++++++--
 .gitlab/ci/jobs/doc/build_all.yml                    | 1 +
 19 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/.gitlab/ci/jobs/build/arm64.yml b/.gitlab/ci/jobs/build/arm64.yml
index 297ab7178727..b2e3e5237fb1 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 a3a6992edffd..c0982bf97546 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 52fd82b428cd..f5c9d9e7216e 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 7f7544a5fe90..e9cca0712e34 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 590ee301acb4..3a9f08adb21c 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 4d844c0230db..bf20b0a9b1b0 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 952107cfe355..6f192ef78f3a 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 d154e617810b..e4d18d951a8c 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 0e565dcec760..03f2b60b0dbc 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 08506ee99740..87966fa55262 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 2d029b09fe4b..2d1ea6497ca7 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 0308d8669c3c..0a00633d7574 100644
--- a/.gitlab/ci/jobs/build/kernels.yml
+++ b/.gitlab/ci/jobs/build/kernels.yml
@@ -1,6 +1,7 @@
 build_kernels:
   extends:
     - .kernels_template
+    - .tags_template__build
   stage: build
   needs: [trigger]
   script:
diff --git a/.gitlab/ci/jobs/build/static_arm64_experimental.yml b/.gitlab/ci/jobs/build/static_arm64_experimental.yml
index 52c239152c48..cc6eb8697db8 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 81becf4d396d..4ce71cb04dfe 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 475930848e82..22f36ea95691 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 181fde405096..06302d00600a 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 773cb59b6293..4cf2d96ea2cf 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 e11e19d5b7b2..1e73d926e6d7 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 83e9477deb02..17f4f91ecee2 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:
-- 
GitLab


From 16240c5461585341e1e334c22317661c46b3d4c0 Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Wed, 21 Jun 2023 19:10:18 +0200
Subject: [PATCH 03/11] CI: refactor tagging of all [coverage] jobs

---
 .gitlab/ci/jobs/coverage/coverage.yml         | 1 +
 .gitlab/ci/jobs/coverage/coverage_default.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitlab/ci/jobs/coverage/coverage.yml b/.gitlab/ci/jobs/coverage/coverage.yml
index bd3ffb560e16..2aa4ce7d24bd 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 849fbb3bd0a6..8fd381914467 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:
-- 
GitLab


From 2cf67fd984ea47098ba9a5c8b0dcecec58f9215a Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Wed, 21 Jun 2023 19:10:27 +0200
Subject: [PATCH 04/11] CI: refactor tagging of all [doc] jobs

---
 .gitlab/ci/jobs/doc/linkcheck.yml |  1 +
 .gitlab/ci/jobs/doc/publish.yml   |  1 +
 .gitlab/ci/jobs/doc/tests.yml     | 31 ++++++++++---------------------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/.gitlab/ci/jobs/doc/linkcheck.yml b/.gitlab/ci/jobs/doc/linkcheck.yml
index 8cd8091fbc0b..82df8408ce6f 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 92def03e326b..2895318477f2 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 f011f72d0bd8..3cefb2e26573 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}
 
-- 
GitLab


From 2636936a9cd2b9586be0195caa7a390c4b6df1b0 Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Wed, 21 Jun 2023 19:10:35 +0200
Subject: [PATCH 05/11] CI: refactor tagging of all [packaging] jobs

---
 .gitlab/ci/jobs/packaging/opam_prepare.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab/ci/jobs/packaging/opam_prepare.yml b/.gitlab/ci/jobs/packaging/opam_prepare.yml
index 39331f13159f..49db12757265 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]
-- 
GitLab


From 953239d563b687ad0dafb5994e5be54fbefed81a Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Wed, 21 Jun 2023 19:43:50 +0200
Subject: [PATCH 06/11] CI: refactor tagging of all [prepare_release] jobs

---
 .../ci/jobs/prepare_release/docker_merge_manifests_release.yml   | 1 +
 .gitlab/ci/jobs/prepare_release/docker_merge_manifests_test.yml  | 1 +
 2 files changed, 2 insertions(+)

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 9f645d7e8e9d..a339140d43db 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 fecff647b86c..bbe434a96430 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"
-- 
GitLab


From 70739793615553cd4517a3f797ace12a8deb00d6 Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Wed, 21 Jun 2023 19:11:00 +0200
Subject: [PATCH 07/11] CI: refactor tagging of all [publish] jobs

---
 .gitlab/ci/jobs/publish/common.yml                           | 4 ++++
 .gitlab/ci/jobs/publish/docker_promote_to_latest_release.yml | 1 +
 .gitlab/ci/jobs/publish/docker_promote_to_latest_test.yml    | 3 ++-
 .gitlab/ci/jobs/publish/gitlab.yml                           | 2 ++
 .gitlab/ci/jobs/publish/kernel_sdk.yml                       | 1 +
 .gitlab/ci/jobs/publish/opam.yml                             | 1 +
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.gitlab/ci/jobs/publish/common.yml b/.gitlab/ci/jobs/publish/common.yml
index 292fc0b35560..b6286d64ff53 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 2bf1ba7a6900..27d53a7680fe 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 b6dd6413efc8..718cc218fc2f 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 e2446314334a..21851c2155f7 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 152fa06a8bf2..19b62976e6a3 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 a61df2437deb..44311f796997 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
-- 
GitLab


From b096141a9fb0d07c5d207fb43c8b1f1ccdc12655 Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Wed, 21 Jun 2023 19:11:09 +0200
Subject: [PATCH 08/11] CI: refactor tagging of all [sanity] jobs

---
 .gitlab/ci/jobs/sanity/docker_hadolint.yml | 1 +
 .gitlab/ci/jobs/sanity/sanity_ci.yml       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitlab/ci/jobs/sanity/docker_hadolint.yml b/.gitlab/ci/jobs/sanity/docker_hadolint.yml
index 3a1cf7db927d..e50ccdb72552 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 b20a46426632..12fd115cded8 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
-- 
GitLab


From a565a52506da570ca711f09353869dd8043083e4 Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Thu, 22 Jun 2023 14:07:57 +0200
Subject: [PATCH 09/11] CI: refactor tagging of all [test] jobs

---
 .gitlab/ci/jobs/test/check_scripts.yml                 | 2 ++
 .gitlab/ci/jobs/test/common.yml                        | 1 +
 .gitlab/ci/jobs/test/ometrics_code_quality.yml         | 1 +
 .gitlab/ci/jobs/test/ometrics_code_quality_default.yml | 1 +
 .gitlab/ci/jobs/test/semgrep.yml                       | 1 +
 .gitlab/ci/jobs/test/tezt.yml                          | 1 +
 .gitlab/ci/jobs/test/tezt_build_long.yml               | 1 +
 .gitlab/ci/jobs/test/unit.yml                          | 4 +++-
 8 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.gitlab/ci/jobs/test/check_scripts.yml b/.gitlab/ci/jobs/test/check_scripts.yml
index 90c769016cb7..971d3aebf566 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 8a6e9590f4e2..6b2f99e11605 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 26ab7715bf38..635c48c1b1ee 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 aa01c8b261d6..8374d7da3cef 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 6532232b7193..f65a7c5b91f5 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 fe9140209c66..86c433453561 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 5b0c0b9ca762..afc23202dcb8 100644
--- a/.gitlab/ci/jobs/test/tezt_build_long.yml
+++ b/.gitlab/ci/jobs/test/tezt_build_long.yml
@@ -3,6 +3,7 @@
 tezt:build-long:
   extends:
     - .build_template
+    - .tags_template__default
   stage: test
   script:
     - make -C ${CI_PROJECT_DIR}/.gitlab/ci test-tezt-build-long
diff --git a/.gitlab/ci/jobs/test/unit.yml b/.gitlab/ci/jobs/test/unit.yml
index 46281698cc6b..521eefee560d 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"
-- 
GitLab


From bf5cb5fe3d66e0aa9faa13d1caa4e78791cadcc4 Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Thu, 22 Jun 2023 14:56:38 +0200
Subject: [PATCH 10/11] fixup! CI: refactor tagging of all [build] jobs

---
 .gitlab/ci/jobs/test/tezt_build_long.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab/ci/jobs/test/tezt_build_long.yml b/.gitlab/ci/jobs/test/tezt_build_long.yml
index afc23202dcb8..540f12dea233 100644
--- a/.gitlab/ci/jobs/test/tezt_build_long.yml
+++ b/.gitlab/ci/jobs/test/tezt_build_long.yml
@@ -2,8 +2,8 @@
 # they can be built in the performance regression test framework executors.
 tezt:build-long:
   extends:
-    - .build_template
     - .tags_template__default
+    - .build_template
   stage: test
   script:
     - make -C ${CI_PROJECT_DIR}/.gitlab/ci test-tezt-build-long
-- 
GitLab


From 3d78984dd39737899f56df0e933dc45665cfc4fd Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Thu, 22 Jun 2023 14:57:23 +0200
Subject: [PATCH 11/11] fixup! CI: refactor tagging of all [build] jobs

---
 .gitlab/ci/jobs/build/kernels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab/ci/jobs/build/kernels.yml b/.gitlab/ci/jobs/build/kernels.yml
index 0a00633d7574..7495d0da7ec4 100644
--- a/.gitlab/ci/jobs/build/kernels.yml
+++ b/.gitlab/ci/jobs/build/kernels.yml
@@ -1,7 +1,7 @@
 build_kernels:
   extends:
-    - .kernels_template
     - .tags_template__build
+    - .kernels_template
   stage: build
   needs: [trigger]
   script:
-- 
GitLab