From 2bf1ce6cc34a30f61ade6247aa940ffa0e0c965d Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 6 Dec 2022 13:27:30 -0500
Subject: gitlab-ci: drop unnecessary linux kernel version tag on 3.25 release
 branch

All our CI hosts now have Linux kernel version 3.17 or higher,
so we no longer need a dedicated tag.

This backports commit c212c7dc8b (gitlab-ci: drop unnecessary linux
kernel version tag, 2022-11-30) to the 3.25 release branch.
---
 .gitlab-ci.yml       | 28 ++++++++++++++--------------
 .gitlab/os-linux.yml | 21 ++-------------------
 2 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 712ebd1..6bd08ee 100644
--- a/.gitlab-ci.yml
+++ b/.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
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index f6892c9..28be5d3 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -356,20 +356,11 @@
         - docker
         - linux-x86_64
 
-.linux_builder_tags_qt:
-    tags:
-        - cmake
-        - build
-        - docker
-        - linux-x86_64
-        - linux-3.17 # Needed to be able to load Fedora's Qt libraries.
-
 .linux_builder_tags_x11:
     tags:
         - cmake
         - docker
         - linux-x86_64
-        - linux-3.17 # Needed to be able to load Fedora's Qt libraries.
         - x11
 
 .linux_builder_tags_cuda:
@@ -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:
-- 
cgit v0.12