From 5b4a7722b1a5b54ea712a846b0b4795bf2b2b6d0 Mon Sep 17 00:00:00 2001
From: Ben Wallis <atomyc@gmail.com>
Date: Thu, 1 Jul 2021 16:53:53 +0100
Subject: [PATCH] Added veloren-publish tags and veloren-build tags to CI
 configuration

---
 .gitlab-ci.yml                   |  2 +-
 .gitlab/CI/build.gitlab-ci.yml   | 10 ++++++++++
 .gitlab/CI/check.gitlab-ci.yml   |  4 ++++
 .gitlab/CI/publish.gitlab-ci.yml |  2 ++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e667b6c3f0..f79bc5ea6d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ default:
       - runner_system_failure
       - stuck_or_timeout_failure
   tags:
-    - veloren-docker
+    - veloren-build
 
 # NOTE: overriden for the `.tmacos` template so relevant changes need to be mirrored there
 before_script:
diff --git a/.gitlab/CI/build.gitlab-ci.yml b/.gitlab/CI/build.gitlab-ci.yml
index 005dd3ef95..e72b92f6ac 100644
--- a/.gitlab/CI/build.gitlab-ci.yml
+++ b/.gitlab/CI/build.gitlab-ci.yml
@@ -2,6 +2,8 @@ unittests:
   extends: .recompile-branch
   stage: build
   image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
+  tags:
+    - veloren-build
   variables:
     GIT_DEPTH: 9999999999999
   script:
@@ -58,6 +60,8 @@ coverage:
   extends: .release
   stage: build
   image: registry.gitlab.com/veloren/veloren-docker-ci/cache/tarpaulin:${CACHE_IMAGE_TAG}
+  tags:
+    - veloren-build
   script:
     - ln -s /dockercache/target target
     - cat ./.gitlab/scripts/coverage.sh
@@ -163,17 +167,23 @@ air-linux:
   extends:
     - .tlinux
     - .release-nightly-tmp-fix-airshipper
+  tags:
+    - veloren-publish
 
 air-windows:
   extends:
     - .twindows
     - .release-nightly-tmp-fix-airshipper
+  tags:
+    - veloren-publish
 
 air-macos:
   extends:
     - .tmacos
     - .release-nightly-tmp-fix-airshipper
     - .tmacos-master-cache
+  tags:
+    - veloren-publish
 
 # if NOT release or master, allow optional builds
 opt-linux:
diff --git a/.gitlab/CI/check.gitlab-ci.yml b/.gitlab/CI/check.gitlab-ci.yml
index fb8a13171a..13dadd1948 100644
--- a/.gitlab/CI/check.gitlab-ci.yml
+++ b/.gitlab/CI/check.gitlab-ci.yml
@@ -3,6 +3,8 @@ code-quality:
   extends: .recompile-branch
   stage: check
   image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
+  tags:
+    - veloren-build
   script:
     - ln -s /dockercache/target target
     - cat ./.gitlab/scripts/code-quality.sh
@@ -12,6 +14,8 @@ security:
   extends: .recompile-branch
   stage: check
   image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
+  tags:
+    - veloren-build
   allow_failure: true
   script:
     - ln -s /dockercache/target target
diff --git a/.gitlab/CI/publish.gitlab-ci.yml b/.gitlab/CI/publish.gitlab-ci.yml
index 08fc073284..ae79d29aab 100644
--- a/.gitlab/CI/publish.gitlab-ci.yml
+++ b/.gitlab/CI/publish.gitlab-ci.yml
@@ -35,6 +35,8 @@ docker-nightly:
   image:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
+  tags:
+    - veloren-publish
   dependencies:
     - air-linux
   before_script: