From 629d70d8aa3533ecfa617eec6dfa0c803a73df04 Mon Sep 17 00:00:00 2001
From: Denis P <denis.pisarev@parity.io>
Date: Thu, 27 May 2021 17:46:31 +0200
Subject: [PATCH 1/2] CI: chore

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02a81043a7a5d..03fe9f8a2dcab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,7 +54,7 @@ default:
     paths:
       - artifacts/
 
-.kubernetes-build:                 &kubernetes-build
+.kubernetes-env:                   &kubernetes-env
   tags:
     - kubernetes-parity-build
   interruptible:                   true
@@ -62,6 +62,8 @@ default:
 .rust-info-script:                 &rust-info-script
   - rustup show
   - cargo --version
+  - rustup +nightly show
+  - cargo +nightly --version
   - sccache -s
 
 .docker-env:                       &docker-env
@@ -140,7 +142,7 @@ default:
 
 skip-if-draft:
   image:                           paritytech/tools:latest
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   stage:                           .pre
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
@@ -155,7 +157,7 @@ skip-if-draft:
 check-runtime:
   stage:                           check
   image:                           paritytech/tools:latest
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
   variables:
@@ -169,7 +171,7 @@ check-runtime:
 check-signed-tag:
   stage:                           check
   image:                           paritytech/tools:latest
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
@@ -179,7 +181,7 @@ check-signed-tag:
 check-line-width:
   stage:                           check
   image:                           paritytech/tools:latest
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
   script:
@@ -189,7 +191,7 @@ check-line-width:
 test-dependency-rules:
   stage:                           check
   image:                           paritytech/tools:latest
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
   script:
@@ -198,7 +200,7 @@ test-dependency-rules:
 test-prometheus-alerting-rules:
   stage:                           check
   image:                           paritytech/tools:latest
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   rules:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never
@@ -419,7 +421,7 @@ cargo-check-macos:
 check-polkadot-companion-status:
   stage:                           build
   image:                           paritytech/tools:latest
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
   script:
@@ -536,7 +538,7 @@ build-rust-doc:
 
 .build-push-docker-image:          &build-push-docker-image
   <<:                              *build-refs
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   image:                           quay.io/buildah/stable
   variables:                       &docker-build-vars
     <<:                            *default-vars
@@ -598,7 +600,7 @@ publish-docker-subkey:
 publish-s3-release:
   stage:                           publish
   <<:                              *build-refs
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   needs:
     - job:                         build-linux-substrate
       artifacts:                   true
@@ -627,7 +629,7 @@ publish-s3-doc:
     - job:                         build-linux-substrate
       artifacts:                   false
   <<:                              *build-refs
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   variables:
     GIT_STRATEGY:                  none
     BUCKET:                        "releases.parity.io"
@@ -689,6 +691,7 @@ deploy-prometheus-alerting-rules:
 trigger-simnet:
   stage:                           deploy
   image:                           paritytech/tools:latest
+  <<:                              *kubernetes-env
   rules:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never
@@ -705,4 +708,4 @@ trigger-simnet:
     DWNSTRM_ID:                    332
   script:
     # API trigger for a simnet job
-    - ./scripts/gitlab/trigger_pipeline.sh
+    - .maintain/gitlab/trigger_pipeline.sh

From 6582790aee9b1f0c28e75b959e3cd3f187fdba6a Mon Sep 17 00:00:00 2001
From: Denis P <denis.pisarev@parity.io>
Date: Thu, 27 May 2021 17:56:37 +0200
Subject: [PATCH 2/2] CI: pin simnet version

---
 .maintain/gitlab/trigger_pipeline.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.maintain/gitlab/trigger_pipeline.sh b/.maintain/gitlab/trigger_pipeline.sh
index dd9da8102d53a..0e95a6458e4d7 100755
--- a/.maintain/gitlab/trigger_pipeline.sh
+++ b/.maintain/gitlab/trigger_pipeline.sh
@@ -1,13 +1,14 @@
 #!/bin/bash
 
 set -eu
+
 # API trigger another project's pipeline
 echo "Triggering Simnet pipeline."
 
 curl --silent \
     -X POST \
     -F "token=${CI_JOB_TOKEN}" \
-    -F "ref=master" \
+    -F "ref=v3" `# trigger the pinned version of simnet CI config` \
     -F "variables[TRGR_PROJECT]=${TRGR_PROJECT}" \
     -F "variables[TRGR_REF]=${TRGR_REF}" \
     -F "variables[IMAGE_NAME]=${IMAGE_NAME}" \
@@ -38,9 +39,9 @@ for i in $(seq 1 360); do
     STATUS=$(get_status);
     echo "Triggered pipeline status is ${STATUS}";
     if [[ ${STATUS} =~ ^(pending|running|created)$ ]]; then
-        echo "${STATUS}"...";
+        echo;
     elif [[ ${STATUS} =~ ^(failed|canceled|skipped|manual)$ ]]; then
-        echo "Oh noes! Something's broken in: ${PIPELINE_URL}"; exit 1;
+        echo "Something's broken in: ${PIPELINE_URL}"; exit 1;
     elif [[ ${STATUS} =~ ^(success)$ ]]; then
         echo "Look how green it is: ${PIPELINE_URL}"; exit 0;
     else