summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-11-30 13:08:18 -0500
committerBrad King <brad.king@kitware.com>2022-11-30 13:11:11 -0500
commitc212c7dc8b5ecbaea47131f9d354088b667ebf13 (patch)
tree1fe53324990133115f757b6a05d68324e0bf2a35 /.gitlab
parent33fe37a660358c1a565456802e9b2187bda05e4f (diff)
downloadcmake-c212c7dc8b5ecbaea47131f9d354088b667ebf13.tar.gz
gitlab-ci: drop unnecessary linux kernel version tag
All our CI hosts now have Linux kernel version 3.17 or higher, so we no longer need a dedicated tag.
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/os-linux.yml21
1 files changed, 2 insertions, 19 deletions
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index c171c5887f..decf1b1be7 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -381,19 +381,10 @@
- docker
- linux-x86_64
-.linux_x86_64_tags_qt:
- tags:
- - cmake
- - build
- - docker
- - linux-3.17 # Needed to be able to load Fedora's Qt libraries.
- - linux-x86_64
-
.linux_x86_64_tags_x11:
tags:
- cmake
- docker
- - linux-3.17 # Needed to be able to load Fedora's Qt libraries.
- linux-x86_64
- x11
@@ -425,14 +416,6 @@
- docker
- linux-aarch64
-.linux_aarch64_tags_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
@@ -591,7 +574,7 @@
extends:
- .intelclassic_makefiles
- .cmake_test_linux_release
- - .linux_x86_64_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_x86_64_tags_qt
+ - .linux_x86_64_tags
- .run_manually
- .needs_centos6_x86_64
variables: