From 3c9eebd9c0bc575774dcf4da2ad5161eac536c05 Mon Sep 17 00:00:00 2001
From: Alexander Samusev <41779041+alvicsam@users.noreply.github.com>
Date: Mon, 27 Nov 2023 16:23:54 +0100
Subject: [PATCH] [ci] test mq vol.3 (#10)

* [ci] test mq vol.3

* rm cancel pipeline

* fix docker image tag

* fix tag for docker
---
 .gitlab-ci.yml               | 10 ---------
 .gitlab/pipeline/publish.yml |  2 +-
 .gitlab/pipeline/test.yml    | 40 +-----------------------------------
 3 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7e54961fa98..4aef8f6cf8b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -267,16 +267,6 @@ cancel-pipeline-test-linux-stable3:
   needs:
     - job: "test-linux-stable 3/3"
 
-cancel-pipeline-test-linux-stable-additional-tests:
-  extends: .cancel-pipeline-template
-  needs:
-    - job: "test-linux-stable-additional-tests"
-
-cancel-pipeline-test-linux-stable-slow:
-  extends: .cancel-pipeline-template
-  needs:
-    - job: "test-linux-stable-slow"
-
 cancel-pipeline-cargo-check-benches1:
   extends: .cancel-pipeline-template
   needs:
diff --git a/.gitlab/pipeline/publish.yml b/.gitlab/pipeline/publish.yml
index 92ebc9eea1fa..a1d3f419cea1 100644
--- a/.gitlab/pipeline/publish.yml
+++ b/.gitlab/pipeline/publish.yml
@@ -72,7 +72,7 @@ publish-rustdoc:
   script:
     # Dockertag should differ in a merge queue
     # TODO: test this
-    # - if [[ $CI_COMMIT_REF_NAME == *"gh-readonly-queue"* ]]; export DOCKER_IMAGES_VERSION="${CI_COMMIT_SHORT_SHA}"; fi
+    - if [[ $CI_COMMIT_REF_NAME == *"gh-readonly-queue"* ]]; then export DOCKER_IMAGES_VERSION="${CI_COMMIT_SHORT_SHA}"; fi
     - $BUILDAH_COMMAND build
       --format=docker
       --build-arg VCS_REF="${CI_COMMIT_SHA}"
diff --git a/.gitlab/pipeline/test.yml b/.gitlab/pipeline/test.yml
index 9c3fa7701c8f..b015a5a44e82 100644
--- a/.gitlab/pipeline/test.yml
+++ b/.gitlab/pipeline/test.yml
@@ -96,44 +96,6 @@ test-linux-stable-runtime-benchmarks:
 #         --partition count:${CI_NODE_INDEX}/${CI_NODE_TOTAL}
 #     # todo: add flacky-test collector
 
-# TODO: remove me
-test-linux-stable-additional-tests:
-  stage: test
-  extends:
-    - .docker-env
-    - .common-refs
-    - .run-immediately
-    - .pipeline-stopper-artifacts
-  variables:
-    RUST_TOOLCHAIN: stable
-    # Enable debug assertions since we are running optimized builds for testing
-    # but still want to have debug assertions.
-    RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
-  script:
-    # tests were moved to test-linux-stable
-    # the jobs should be removed
-    - exit 0
-
-# TODO: remove me
-test-linux-stable-slow:
-  stage: test
-  # remove after cache is setup
-  timeout: 2h
-  extends:
-    - .docker-env
-    - .common-refs
-    - .run-immediately
-    - .pipeline-stopper-artifacts
-  variables:
-    RUST_TOOLCHAIN: stable
-    # Enable debug assertions since we are running optimized builds for testing
-    # but still want to have debug assertions.
-    RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
-  script:
-    # tests were moved to test-linux-stable
-    # the jobs should be removed
-    - exit 0
-
 # takes about 1,5h without cache
 # can be used to check that nextest works correctly
 # test-linux-stable-polkadot:
@@ -520,6 +482,6 @@ test-syscalls:
     - ./list-syscalls.rb ../../../target/x86_64-unknown-linux-musl/production/polkadot-prepare-worker --only-used-syscalls | diff -u prepare-worker-syscalls -
   after_script:
     - if [[ "$CI_JOB_STATUS" == "failed" ]]; then
-        printf "The x86_64 syscalls used by the worker binaries have changed. Please review if this is expected and update polkadot/scripts/list-syscalls/*-worker-syscalls as needed.\n";
+      printf "The x86_64 syscalls used by the worker binaries have changed. Please review if this is expected and update polkadot/scripts/list-syscalls/*-worker-syscalls as needed.\n";
       fi
   allow_failure: false # this rarely triggers in practice