From 45862d7cde8d8bf293d2c3e42ad789051fd5dddd Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Wed, 1 Dec 2021 22:15:55 -0500
Subject: [PATCH] Changes to test CI time with different images

---
 .gitlab-ci.yml                 |  4 ++--
 .gitlab/CI/build.gitlab-ci.yml |  2 +-
 .gitlab/CI/check.gitlab-ci.yml |  4 ++--
 .gitlab/CI/recompile.yml       | 10 ++--------
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8abe30fe43..c623eb67ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
   # https://docs.gitlab.com/ee/ci/yaml/#shallow-cloning
   GIT_DEPTH: 3
   GIT_CLEAN_FLAGS: -f
-  CACHE_IMAGE_TAG: c94d1580
+  CACHE_IMAGE_TAG: 2e969af5
 
 default:
   # https://docs.gitlab.com/ee/ci/pipelines/settings.html#auto-cancel-pending-pipelines
@@ -41,7 +41,7 @@ workflow:
   rules:
     - if: $CI_MERGE_REQUEST_IID
     - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $GITLAB_USER_ID != "8866215"
+    - if: $CI_COMMIT_BRANCH && $GITLAB_USER_ID != "8866215"
     - if: $CI_COMMIT_REF_NAME =~ /^r[0-9]+\.[0-9]+/ && $GITLAB_USER_ID != "8866215"
 
 include:
diff --git a/.gitlab/CI/build.gitlab-ci.yml b/.gitlab/CI/build.gitlab-ci.yml
index e5d2b57805..55ace186d8 100644
--- a/.gitlab/CI/build.gitlab-ci.yml
+++ b/.gitlab/CI/build.gitlab-ci.yml
@@ -36,7 +36,7 @@ benchmarks:
   extends: .release
   stage: build
   image: registry.gitlab.com/veloren/veloren-docker-ci/cache/bench:${CACHE_IMAGE_TAG}
-  tags: ["veloren/veloren", "check", "benchmark"]
+  tags: ["time-test"]
   script:
     - unset DISABLE_GIT_LFS_CHECK
     - ln -s /dockercache/target target
diff --git a/.gitlab/CI/check.gitlab-ci.yml b/.gitlab/CI/check.gitlab-ci.yml
index ad23e01a9e..7a78828277 100644
--- a/.gitlab/CI/check.gitlab-ci.yml
+++ b/.gitlab/CI/check.gitlab-ci.yml
@@ -3,7 +3,7 @@ code-quality:
   extends: .recompile-branch
   stage: check
   image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
-  tags: ["veloren/veloren", "check"]
+  tags: ["time-test"]
   script:
     - ln -s /dockercache/target target
     - cat ./.gitlab/scripts/code-quality.sh
@@ -13,7 +13,7 @@ security:
   extends: .recompile-branch
   stage: check
   image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
-  tags: ["veloren/veloren", "check"]
+  tags: ["time-test"]
   allow_failure: true
   script:
     - ln -s /dockercache/target target
diff --git a/.gitlab/CI/recompile.yml b/.gitlab/CI/recompile.yml
index a6bc634b8e..17f7e32e15 100644
--- a/.gitlab/CI/recompile.yml
+++ b/.gitlab/CI/recompile.yml
@@ -1,13 +1,7 @@
 # Template to only run if actual changes has been made to the code and not just documentation
 .recompile-branch:
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      # No '-' here is *very* important: https://docs.gitlab.com/ee/ci/yaml/#complex-rule-clauses
-      changes:
-        - "**/*.{glsl,png,rs,ron,toml,vox,yml,wav,sh}"
-        - "rust-toolchain"
-        - "Cargo.lock"
-        - ".gitlab-ci.yml"
+    - when: manual
 
 # TODO: appears unused
 # like .recompile-branch but will run on master too
@@ -17,4 +11,4 @@
         - "**/*.{glsl,png,rs,ron,toml,vox,yml,wav,sh}"
         - "rust-toolchain"
         - "Cargo.lock"
-        - ".gitlab-ci.yml"
\ No newline at end of file
+        - ".gitlab-ci.yml"