Merge topic 'ci-os-arch' into release-3.25

2bf1ce6cc3 gitlab-ci: drop unnecessary linux kernel version tag on 3.25 release branch
429574a94e gitlab-ci: replace '$os' tags with '$os-x86_64' on 3.25 release branch

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

.gitlab-ci.yml

@@ -59,7 +59,7 @@ p:doc-package:
     extends:
         - .fedora36_sphinx_package
         - .cmake_prep_doc_linux
-        - .linux_builder_tags_qt
+        - .linux_builder_tags
         - .cmake_doc_artifacts
         - .run_only_for_package
 
@@ -109,14 +109,14 @@ l:tidy-fedora36:
     extends:
         - .fedora36_tidy
         - .cmake_build_linux
-        - .linux_builder_tags_qt
+        - .linux_builder_tags
         - .run_automatically
 
 l:sphinx-fedora36:
     extends:
         - .fedora36_sphinx
         - .cmake_build_linux
-        - .linux_builder_tags_qt
+        - .linux_builder_tags
         - .run_automatically
     variables:
         CMAKE_CI_JOB_CONTINUOUS: "true"
@@ -126,7 +126,7 @@ l:clang-analyzer-fedora36:
     extends:
         - .fedora36_clang_analyzer
         - .cmake_build_linux
-        - .linux_builder_tags_qt
+        - .linux_builder_tags
         - .run_automatically
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
@@ -158,7 +158,7 @@ t:debian10-ninja:
     extends:
         - .debian10_ninja
         - .cmake_test_linux_release
-        - .linux_builder_tags_qt
+        - .linux_builder_tags
         - .cmake_junit_artifacts
         - .run_dependent
         - .needs_centos6_x86_64
@@ -169,7 +169,7 @@ t:debian10-aarch64-ninja:
     extends:
         - .debian10_aarch64_ninja
         - .cmake_test_linux_release
-        - .linux_builder_tags_aarch64_qt
+        - .linux_builder_tags_aarch64
         - .cmake_junit_artifacts
         - .run_dependent
         - .needs_centos7_aarch64
@@ -180,7 +180,7 @@ t:debian10-ninja-clang:
     extends:
         - .debian10_ninja_clang
         - .cmake_test_linux_release
-        - .linux_builder_tags_qt
+        - .linux_builder_tags
         - .run_manually
         - .needs_centos6_x86_64
     variables:
@@ -190,7 +190,7 @@ t:debian10-makefiles-clang:
     extends:
         - .debian10_makefiles_clang
         - .cmake_test_linux_release
-        - .linux_builder_tags_qt
+        - .linux_builder_tags
         - .run_manually
         - .needs_centos6_x86_64
     variables:
@@ -200,7 +200,7 @@ t:fedora36-makefiles:
     extends:
         - .fedora36_makefiles
         - .cmake_test_linux_release
-        - .linux_builder_tags_qt
+        - .linux_builder_tags
         - .run_dependent
         - .needs_centos6_x86_64
 
@@ -208,7 +208,7 @@ t:fedora36-makefiles-nospace:
     extends:
         - .fedora36_makefiles
         - .cmake_test_linux_release
-        - .linux_builder_tags_qt
+        - .linux_builder_tags
         - .cmake_junit_artifacts
         - .run_dependent
         - .needs_centos6_x86_64
@@ -300,7 +300,7 @@ b:fedora36-ninja:
         - .fedora36_ninja
         - .cmake_build_linux
         - .cmake_build_artifacts
-        - .linux_builder_tags_qt
+        - .linux_builder_tags
         - .run_manually
     variables:
         CMAKE_CI_JOB_CONTINUOUS: "true"
@@ -359,7 +359,7 @@ t:fedora36-ninja-multi:
     extends:
         - .fedora36_ninja_multi
         - .cmake_test_linux_external
-        - .linux_builder_tags_qt
+        - .linux_builder_tags
         - .cmake_junit_artifacts
         - .run_dependent
     dependencies:
@@ -709,7 +709,7 @@ b:fedora36-asan:
         - .fedora36_asan
         - .cmake_build_linux
         - .cmake_build_artifacts
-        - .linux_builder_tags_qt
+        - .linux_builder_tags
         - .run_manually
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
@@ -718,7 +718,7 @@ t:fedora36-asan:
     extends:
         - .fedora36_asan
         - .cmake_memcheck_linux
-        - .linux_builder_tags_qt
+        - .linux_builder_tags
         - .run_dependent
     dependencies:
         - b:fedora36-asan

.gitlab/os-linux.yml

@@ -354,22 +354,13 @@
         - cmake
         - build
         - docker
-        - linux
-
-.linux_builder_tags_qt:
-    tags:
-        - cmake
-        - build
-        - docker
-        - linux
-        - linux-3.17 # Needed to be able to load Fedora's Qt libraries.
+        - linux-x86_64
 
 .linux_builder_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:
@@ -377,14 +368,14 @@
         - cmake
         - cuda-rt
         - docker
-        - linux
+        - linux-x86_64
 
 .linux_builder_tags_radeon:
     tags:
         - cmake
         - radeon
         - docker
-        - linux
+        - linux-x86_64
 
 .linux_builder_tags_aarch64:
     tags:
@@ -393,14 +384,6 @@
         - docker
         - linux-aarch64
 
-.linux_builder_tags_aarch64_qt:
-    tags:
-        - cmake
-        - build
-        - docker
-        - linux-aarch64
-        - linux-3.17 # Needed to be able to load Fedora's Qt libraries.
-
 ## Linux-specific scripts
 
 .before_script_linux: &before_script_linux
@@ -559,7 +542,7 @@
     extends:
         - .intelclassic_makefiles
         - .cmake_test_linux_release
-        - .linux_builder_tags_qt
+        - .linux_builder_tags
         - .run_manually
         - .needs_centos6_x86_64
     variables:
@@ -569,7 +552,7 @@
     extends:
         - .inteloneapi_makefiles
         - .cmake_test_linux_release
-        - .linux_builder_tags_qt
+        - .linux_builder_tags
         - .run_manually
         - .needs_centos6_x86_64
     variables:

.gitlab/os-macos.yml

@@ -93,7 +93,7 @@
 .macos_x86_64_builder_tags:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - macos
+        - macos-x86_64
         - shell
         - xcode-14.1
         - nonconcurrent
@@ -101,7 +101,7 @@
 .macos_x86_64_builder_tags_package:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - macos
+        - macos-x86_64
         - shell
         - xcode-14.1
         - nonconcurrent
@@ -110,7 +110,7 @@
 .macos_x86_64_builder_ext_tags:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - macos
+        - macos-x86_64
         - shell
         - xcode-14.1
         - concurrent

.gitlab/os-windows.yml

@@ -229,7 +229,7 @@
 .windows_tags_nonconcurrent_vs2022:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - windows
+        - windows-x86_64
         - shell
         - vs2022
         - msvc-19.34
@@ -238,7 +238,7 @@
 .windows_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
@@ -247,7 +247,7 @@
 .windows_tags_concurrent_vs2022:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - windows
+        - windows-x86_64
         - shell
         - vs2022
         - msvc-19.34
@@ -256,7 +256,7 @@
 .windows_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
@@ -265,7 +265,7 @@
 .windows_tags_concurrent:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - windows
+        - windows-x86_64
         - shell
         - concurrent
 

.gitlab/upload.yml

@@ -6,7 +6,7 @@
     tags:
         - cmake
         - docker
-        - linux
+        - linux-x86_64
         - build
     environment:
         name: rsync-upload
@@ -25,7 +25,7 @@
     tags:
         - cmake
         - docker
-        - linux
+        - linux-x86_64
         - build
     environment:
         name: rsync-upload