From ddbe5cddf12334d3847015615f49481f986b0b20 Mon Sep 17 00:00:00 2001
From: Alexander Samusev <41779041+alvicsam@users.noreply.github.com>
Date: Tue, 31 Jan 2023 16:37:47 +0100
Subject: [PATCH] [ci] change runners (#1833)

---
 .gitlab-ci.yml | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 698dc09e79..d87b78713e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,21 +5,24 @@ stages:
   - build
   - publish
 
-workflow:
-  rules:
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH
-
-variables:                         &default-vars
+variables:
   GIT_STRATEGY:                    fetch
   GIT_DEPTH:                       100
   CARGO_INCREMENTAL:               0
   ARCH:                            "x86_64"
   CI_IMAGE:                        "paritytech/bridges-ci:production"
+  BUILDAH_IMAGE:                   "quay.io/buildah/stable:v1.27"
   RUST_BACKTRACE:                  full
 
 default:
   cache:                           {}
+  interruptible:                   true
+  retry:
+    max: 2
+    when:
+      - runner_system_failure
+      - unknown_failure
+      - api_failure
 
 .collect-artifacts:                &collect-artifacts
   artifacts:
@@ -32,7 +35,6 @@ default:
 .kubernetes-build:                 &kubernetes-build
   tags:
     - kubernetes-parity-build
-  interruptible:                   true
 
 .docker-env:                       &docker-env
   image:                           "${CI_IMAGE}"
@@ -41,16 +43,8 @@ default:
     - cargo --version
     - rustup +nightly show
     - cargo +nightly --version
-    - sccache -s
-  retry:
-    max: 2
-    when:
-      - runner_system_failure
-      - unknown_failure
-      - api_failure
-  interruptible:                   true
   tags:
-    - linux-docker
+    - linux-docker-vm-c2
 
 .test-refs:                        &test-refs
   rules:
@@ -237,7 +231,7 @@ build-nightly:
 
 .build-push-image:                 &build-push-image
   <<:                              *kubernetes-build
-  image:                           quay.io/buildah/stable:v1.27
+  image:                           $BUILDAH_IMAGE
   <<:                              *build-refs
   variables:                       &image-variables
     GIT_STRATEGY:                  none
@@ -248,7 +242,7 @@ build-nightly:
   needs:
     - job:                         build
       artifacts:                   true
-  before_script:                   &check-versions
+  before_script:
     - echo "Starting docker image build/push with name '${IMAGE_NAME}' for '${BRIDGES_PROJECT}' with Dockerfile = '${DOCKERFILE}'"
     - if [[ "${CI_COMMIT_TAG}" ]]; then
         VERSION=${CI_COMMIT_TAG};