Merge topic 'ci-os-arch'

c212c7dc8b gitlab-ci: drop unnecessary linux kernel version tag
33fe37a660 gitlab-ci: replace '{macos,windows}' tags with '{macos,windows}-x86_64'
94d82d91d5 gitlab-ci: replace 'linux' tags with 'linux-x86_64'
e8c6e06815 gitlab-ci: rename tag configuration entries to start in '$os_$arch_tags'
ebbc3a8171 gitlab-ci: remove unnecessary component of configuration entry names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7973

3 files changed, 31 insertions, 48 deletions

diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index f2946c1bd5..decf1b1be7 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -374,64 +374,47 @@
 
 ## Tags
 
-.linux_builder_tags:
+.linux_x86_64_tags:
     tags:
         - cmake
         - build
         - docker
-        - linux
+        - linux-x86_64
 
-.linux_builder_tags_qt:
-    tags:
-        - cmake
-        - build
-        - docker
-        - linux
-        - linux-3.17 # Needed to be able to load Fedora's Qt libraries.
-
-.linux_builder_tags_x11:
+.linux_x86_64_tags_x11:
     tags:
         - cmake
         - docker
-        - linux
-        - linux-3.17 # Needed to be able to load Fedora's Qt libraries.
+        - linux-x86_64
         - x11
 
-.linux_builder_tags_cuda:
+.linux_x86_64_tags_cuda:
     tags:
         - cmake
         - cuda-rt
         - docker
-        - linux
+        - linux-x86_64
 
-.linux_x86_64_v3_builder_tags_cuda:
+.linux_x86_64_v3_tags_cuda:
     tags:
         - cmake
         - cuda-rt
         - docker
         - linux-x86_64-v3
 
-.linux_builder_tags_radeon:
+.linux_x86_64_tags_radeon:
     tags:
         - cmake
         - radeon
         - docker
-        - linux
-
-.linux_builder_tags_aarch64:
-    tags:
-        - cmake
-        - build
-        - docker
-        - linux-aarch64
+        - linux-x86_64
 
-.linux_builder_tags_aarch64_qt:
+.linux_aarch64_tags:
     tags:
         - cmake
         - build
         - docker
         - linux-aarch64
-        - linux-3.17 # Needed to be able to load Fedora's Qt libraries.
 
 ## Linux-specific scripts
 
@@ -591,7 +574,7 @@
     extends:
         - .intelclassic_makefiles
         - .cmake_test_linux_release
-        - .linux_builder_tags_qt
+        - .linux_x86_64_tags
         - .run_manually
         - .needs_centos6_x86_64
     variables:
@@ -601,7 +584,7 @@
     extends:
         - .inteloneapi_makefiles
         - .cmake_test_linux_release
-        - .linux_builder_tags_qt
+        - .linux_x86_64_tags
         - .run_manually
         - .needs_centos6_x86_64
     variables:
@@ -613,7 +596,7 @@
     stage: build
     extends:
         - .fedora37
-        - .linux_builder_tags
+        - .linux_x86_64_tags
         - .cmake_org_help_artifacts
     script:
         - *before_script_linux
diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml
index 4b71a1b965..258fa314d8 100644
--- a/.gitlab/os-macos.yml
+++ b/.gitlab/os-macos.yml
@@ -90,32 +90,32 @@
 
 ## Tags
 
-.macos_x86_64_builder_tags:
+.macos_x86_64_tags:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - macos
+        - macos-x86_64
         - shell
         - xcode-14.1
         - nonconcurrent
 
-.macos_x86_64_builder_tags_package:
+.macos_x86_64_tags_package:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - macos
+        - macos-x86_64
         - shell
         - xcode-14.1
         - nonconcurrent
         - finder
 
-.macos_x86_64_builder_ext_tags:
+.macos_x86_64_tags_ext:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - macos
+        - macos-x86_64
         - shell
         - xcode-14.1
         - concurrent
 
-.macos_arm64_builder_tags:
+.macos_arm64_tags:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
         - macos-arm64
@@ -123,7 +123,7 @@
         - xcode-14.1
         - nonconcurrent
 
-.macos_arm64_builder_ext_tags:
+.macos_arm64_tags_ext:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
         - macos-arm64
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index 64b595e694..22d731a907 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -273,46 +273,46 @@
 
 ## Tags
 
-.windows_tags_nonconcurrent_vs2022:
+.windows_x86_64_tags_nonconcurrent_vs2022:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - windows
+        - windows-x86_64
         - shell
         - vs2022
         - msvc-19.34
         - nonconcurrent
 
-.windows_tags_nonconcurrent_vs2022_arm64:
+.windows_x86_64_tags_nonconcurrent_vs2022_arm64:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - windows
+        - windows-x86_64
         - shell
         - vs2022
         - msvc-19.34-arm64
         - nonconcurrent
 
-.windows_tags_concurrent_vs2022:
+.windows_x86_64_tags_concurrent_vs2022:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - windows
+        - windows-x86_64
         - shell
         - vs2022
         - msvc-19.34
         - concurrent
 
-.windows_tags_concurrent_vs2019:
+.windows_x86_64_tags_concurrent_vs2019:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - windows
+        - windows-x86_64
         - shell
         - vs2019
         - msvc-19.29-16.11
         - concurrent
 
-.windows_tags_concurrent:
+.windows_x86_64_tags_concurrent:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - windows
+        - windows-x86_64
         - shell
         - concurrent