[ci skip] Remove indirection for default tags parameter.

Change-Id: I839dd92c3884a963bb64eeb396df7d9c25340d24

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b679485105d2d5761bc0e1f542ba75e0906edc61..7e0c2346582f9a176fa6c670ab1a0049719349a2 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,6 +36,10 @@ stages:
   # Deploy stage for release builds
   - release-deploy
 
+default:
+  tags:
+    - k8s-scilifelab
+
 include:
   - local: '/admin/ci-templates/.image-templates.yml'
   - local: '/admin/ci-templates/.build-cache-template.yml'
@@ -50,7 +54,6 @@ include:
   - local: '/admin/ci-templates/.clang-test-template.yml'
   - local: '/admin/ci-templates/.clang-before-script.yml'
   - local: '/admin/ci-templates/.documentation-before-script.yml'
-  - local: '/admin/ci-templates/.tags-template.yml'
   - local: '/admin/ci-templates/.test-script-template.yml'
   - local: '/admin/ci-templates/.build-docs-template.yml'
   - local: '/admin/ci-templates/.cuda-template.yml'

diff --git a/admin/ci-templates/.tags-template.yml b/admin/ci-templates/.tags-template.yml
deleted file mode 100644 (file)
index 57d9580..0000000
--- a/admin/ci-templates/.tags-template.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-.tags-template:
-  tags:
-    - k8s-scilifelab

diff --git a/admin/gitlab-ci/documentation.gitlab-ci.yml b/admin/gitlab-ci/documentation.gitlab-ci.yml
index e1b6097ffa74fdfa583fc4c719e91199e2b764df..2e8b52168cee10416da3f57fb6e81151475c3668 100644 (file)
--- a/admin/gitlab-ci/documentation.gitlab-ci.yml
+++ b/admin/gitlab-ci/documentation.gitlab-ci.yml
@@ -23,7 +23,6 @@
   extends:
     - .binary-build-template
     - .variables-template
-    - .tags-template
     - .no-cache-template
     - .build-docs-webpage-template
     - .documentation-before-script-template

diff --git a/admin/gitlab-ci/lint.gitlab-ci.yml b/admin/gitlab-ci/lint.gitlab-ci.yml
index fb2189b094b457a4f9a501d34737788565b76fc3..1b12c5d628df2f6d1ea7e8e20de101f16fde4a9a 100644 (file)
--- a/admin/gitlab-ci/lint.gitlab-ci.yml
+++ b/admin/gitlab-ci/lint.gitlab-ci.yml
@@ -23,7 +23,6 @@ run-clang-format:
     - .binary-build-template
     - .no-cache-template
     - .variables-template
-    - .tags-template
     - .clang-before-script-template
     - .build-clang-template
     - .clang7-template
@@ -57,7 +56,6 @@ run-copyright-check:
     - .binary-build-template
     - .no-cache-template
     - .variables-template
-    - .tags-template
     - .clang-before-script-template
     - .build-clang-template
     - .clang7-template
@@ -92,7 +90,6 @@ run-check-source:
   extends:
     - .no-cache-template
     - .variables-template
-    - .tags-template
     - .build-docs-binary-template
     - .documentation-before-script-template
   stage: source-check

diff --git a/admin/gitlab-ci/testing-matrix.gitlab-ci.yml b/admin/gitlab-ci/testing-matrix.gitlab-ci.yml
index b8a75d783572c645f54229026fd49ccc655861fc..694bed25592f40d26702a430d4785b1ec137baf1 100644 (file)
--- a/admin/gitlab-ci/testing-matrix.gitlab-ci.yml
+++ b/admin/gitlab-ci/testing-matrix.gitlab-ci.yml
@@ -4,21 +4,18 @@
     - .configure-build-template
     - .no-cache-template
     - .variables-template
-    - .tags-template
 
 .configure-release-extends-template:
   extends:
     - .configure-build-release-template
     - .no-cache-template
     - .variables-template
-    - .tags-template
 
 .build-extends-template:
   extends:
     - .binary-build-template
     - .build-cache-template
     - .variables-template
-    - .tags-template
 
 .test-extends-template:
   extends:
@@ -26,13 +23,11 @@
     - .pull-cache-template
     - .test-script-template
     - .variables-template
-    - .tags-template
 
 .regressiontests-extends-template:
   extends:
     - .no-cache-template
     - .variables-template
-    - .tags-template
 
 
 # Templates for configuration stage
@@ -126,7 +121,6 @@ simple-build:
     - .simple-build-template
     - .build-cache-template
     - .variables-template
-    - .tags-template
     - .gcc-before-script-template
     - .build-gcc-template
     - .gcc7-template