From cea64c4c1120e0aabc45763ee3166b8e6c79e1e5 Mon Sep 17 00:00:00 2001
From: radupopa2010 <radupopa2010@yahoo.com>
Date: Tue, 17 Aug 2021 13:26:17 +0200
Subject: [PATCH 01/11] upgrade simnet tests to v8

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc5b397af1b17..707affdf2b4ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -181,7 +181,7 @@ check-signed-tag:
   <<:                              *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
+    - if: $CI_COMMIT_REF_NAME =~ /^v/[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
   script:
     - ./.maintain/gitlab/check_signed.sh
 
@@ -587,9 +587,9 @@ build-rustdoc:
   after_script:
     - buildah logout "$IMAGE_NAME"
     # pass artifacts to the trigger-simnet job
-    - echo "IMAGE_NAME=${IMAGE_NAME}" | tee -a ./artifacts/$PRODUCT/build.env
+    - echo "SUBSTRATE_IMAGE_NAME=${IMAGE_NAME}" | tee -a ./artifacts/$PRODUCT/build.env
     - IMAGE_TAG="$(cat ./artifacts/$PRODUCT/VERSION)"
-    - echo "IMAGE_TAG=${IMAGE_TAG}"   | tee -a ./artifacts/$PRODUCT/build.env
+    - echo "SUBSTRATE_IMAGE_TAG=${IMAGE_TAG}"   | tee -a ./artifacts/$PRODUCT/build.env
     - cat ./artifacts/$PRODUCT/build.env
 
 publish-docker-substrate:
@@ -729,9 +729,11 @@ deploy-prometheus-alerting-rules:
         - .gitlab-ci.yml
         - .maintain/monitoring/**/*
 
-trigger-simnet:
+# runs quick and log tests on nightly schedule
+simnet-tests:
   stage:                           deploy
-  image:                           paritytech/tools:latest
+  # fixme: replace v8 with $SIMNET_REF on line below
+  image:                           docker.io/paritytech/simnet:v8
   <<:                              *kubernetes-env
   rules:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
@@ -740,13 +742,42 @@ trigger-simnet:
     - if: $CI_COMMIT_REF_NAME == "master"
   needs:
     - job:                         publish-docker-substrate
-  # `build.env` brings here `$IMAGE_NAME` and `$IMAGE_TAG` (`$VERSION` here,
-  # i.e. `2643-0.8.29-5f689e0a-6b24dc54`).
-  variables:
-    TRGR_PROJECT:                  ${CI_PROJECT_NAME}
-    TRGR_REF:                      ${CI_COMMIT_REF_NAME}
-    # Simnet project ID
-    DWNSTRM_ID:                    332
-  script:
-    # API trigger for a Simnet job
-    - .maintain/gitlab/trigger_pipeline.sh --simnet-version=${SIMNET_REF}
+  # variables:
+  # `build.env` brings here `${SUBSTRATE_IMAGE_NAME}` and `${SUBSTRATE_IMAGE_TAG}`
+  # (`$VERSION` here, # i.e. `2643-0.8.29-5f689e0a-6b24dc54`).
+  # ${SIMNET_REF} is a gitlab variable
+  script:
+    - /home/nonroot/simnet/gurke/scripts/run-test-environment-manager.sh
+        --github-remote-dir=https://github.com/paritytech/substrate/tree/master/simnet_tests
+        --config=simnet_tests/configs/default_local_testnet.toml
+        --image="${SUBSTRATE_IMAGE_NAME}:${SUBSTRATE_IMAGE_TAG}"
+  retry: 2
+  tags:
+    - parity-simnet
+
+# runs on every commit
+# simnet-tests-quick:
+#   stage:                           deploy
+#   # fixme: replace v8 with $SIMNET_REF on line below
+#   image:                           docker.io/paritytech/simnet:v8
+#   <<:                              *kubernetes-env
+#   rules:
+#     - if: $CI_PIPELINE_SOURCE == "pipeline"
+#       when: never
+#     - if: $CI_PIPELINE_SOURCE == "web" && $CI_COMMIT_REF_NAME == "master"
+#     - if: $CI_COMMIT_REF_NAME == "master"
+#   needs:
+#     - job:                         publish-docker-substrate
+#   # variables:
+#   # `build.env` brings here `${SUBSTRATE_IMAGE_NAME}` and `${SUBSTRATE_IMAGE_TAG}`
+#   # (`$VERSION` here, # i.e. `2643-0.8.29-5f689e0a-6b24dc54`).
+#   # ${SIMNET_REF} is a gitlab variable
+#   script:
+#     - /home/nonroot/simnet/gurke/scripts/run-test-environment-manager.sh
+#         --github-remote-dir=https://github.com/paritytech/substrate/tree/master/simnet_tests
+#         --config=simnet_tests/configs/default_local_testnet.toml
+#         --image="${SUBSTRATE_IMAGE_NAME}:${SUBSTRATE_IMAGE_TAG}"
+#         --features=simnet_tests/tests/quick/
+#   retry: 2
+#   tags:
+#     - parity-simnet

From e88d95e4b62cc4257e68ce3f2f55346a7836b5cb Mon Sep 17 00:00:00 2001
From: radupopa2010 <radupopa2010@yahoo.com>
Date: Tue, 17 Aug 2021 13:29:41 +0200
Subject: [PATCH 02/11] undo change by mistake

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 707affdf2b4ed..3dfe62d0b506a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -181,7 +181,7 @@ check-signed-tag:
   <<:                              *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
+    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
   script:
     - ./.maintain/gitlab/check_signed.sh
 

From f2cd433069aef77012baf3f104083d175a7dba01 Mon Sep 17 00:00:00 2001
From: radupopa2010 <radupopa2010@yahoo.com>
Date: Wed, 18 Aug 2021 12:04:48 +0200
Subject: [PATCH 03/11] add suggested changes

---
 .gitlab-ci.yml | 34 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3dfe62d0b506a..53f8e2e1c2dcb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -729,7 +729,9 @@ deploy-prometheus-alerting-rules:
         - .gitlab-ci.yml
         - .maintain/monitoring/**/*
 
-# runs quick and log tests on nightly schedule
+# Runs "quick" and "long" tests on nightly schedule.A Quick test is a smoke test
+# where basic check-expect tests run based on checking values from metrics
+# Long Test is the load testing where we send 50K transactions into the network
 simnet-tests:
   stage:                           deploy
   # fixme: replace v8 with $SIMNET_REF on line below
@@ -748,36 +750,10 @@ simnet-tests:
   # ${SIMNET_REF} is a gitlab variable
   script:
     - /home/nonroot/simnet/gurke/scripts/run-test-environment-manager.sh
-        --github-remote-dir=https://github.com/paritytech/substrate/tree/master/simnet_tests
-        --config=simnet_tests/configs/default_local_testnet.toml
+        --github-remote-dir="https://github.com/paritytech/substrate/tree/master/simnet_tests"
+        --config="simnet_tests/configs/default_local_testnet.toml"
         --image="${SUBSTRATE_IMAGE_NAME}:${SUBSTRATE_IMAGE_TAG}"
   retry: 2
   tags:
     - parity-simnet
 
-# runs on every commit
-# simnet-tests-quick:
-#   stage:                           deploy
-#   # fixme: replace v8 with $SIMNET_REF on line below
-#   image:                           docker.io/paritytech/simnet:v8
-#   <<:                              *kubernetes-env
-#   rules:
-#     - if: $CI_PIPELINE_SOURCE == "pipeline"
-#       when: never
-#     - if: $CI_PIPELINE_SOURCE == "web" && $CI_COMMIT_REF_NAME == "master"
-#     - if: $CI_COMMIT_REF_NAME == "master"
-#   needs:
-#     - job:                         publish-docker-substrate
-#   # variables:
-#   # `build.env` brings here `${SUBSTRATE_IMAGE_NAME}` and `${SUBSTRATE_IMAGE_TAG}`
-#   # (`$VERSION` here, # i.e. `2643-0.8.29-5f689e0a-6b24dc54`).
-#   # ${SIMNET_REF} is a gitlab variable
-#   script:
-#     - /home/nonroot/simnet/gurke/scripts/run-test-environment-manager.sh
-#         --github-remote-dir=https://github.com/paritytech/substrate/tree/master/simnet_tests
-#         --config=simnet_tests/configs/default_local_testnet.toml
-#         --image="${SUBSTRATE_IMAGE_NAME}:${SUBSTRATE_IMAGE_TAG}"
-#         --features=simnet_tests/tests/quick/
-#   retry: 2
-#   tags:
-#     - parity-simnet

From f8eaecbf197a98111971dae3fc539f9c3eae34cf Mon Sep 17 00:00:00 2001
From: radupopa2010 <radupopa2010@yahoo.com>
Date: Wed, 18 Aug 2021 12:11:16 +0200
Subject: [PATCH 04/11] rm un-used script

---
 .maintain/gitlab/trigger_pipeline.sh | 201 ---------------------------
 1 file changed, 201 deletions(-)
 delete mode 100755 .maintain/gitlab/trigger_pipeline.sh

diff --git a/.maintain/gitlab/trigger_pipeline.sh b/.maintain/gitlab/trigger_pipeline.sh
deleted file mode 100755
index 3ed9215405afb..0000000000000
--- a/.maintain/gitlab/trigger_pipeline.sh
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/bin/bash
-
-set -eou pipefail
-
-# This script is to trigger Simnet pipeline.
-# See help article for more details.
-
-SCRIPT_NAME="$0"
-SCRIPT_PATH=$(dirname "$0")               # relative
-SCRIPT_PATH=$(cd "${SCRIPT_PATH}" && pwd) # absolutized and normalized
-SIMNET_VERSION=""
-
-function usage {
-  cat << EOF
-This script is to trigger Simnet pipeline.
-It's designed to be launched locally and from CI.
-The required argumants for both cases are listed below.
-
-Usage: ${SCRIPT_NAME} OPTION
-
-OPTIONS
-
-    -h, --help                  Print this help message.
-
-  Mandatory in both cases:
-
-    -s, --simnet-version        Simnet version to trigger.
-                                E.g.: v4
-
-    -u, --upstream-project      Triggering project.
-                                E.g.: substrate
-
-    -r, --upstream-ref          The branch or tag name for which project is built.
-                                E.g.: master
-
-    -d, --downstream-id         Downstream project's ID to trigger.
-                                E.g.: 332 (simnet project id)
-
-    -n, --image-name            Name of image to test.
-                                E.g.: docker.io/paritypr/synth-wave
-
-    -i, --image-tag             Tag of the image to test.
-                                E.g.: master
-
-    -c, --collator-image-tag    Tag of collator image. Image name is hardcoded.
-                                E.g.: master
-
-  Required for local launch:
-
-    -g, --ci-server-fqdn        FQDN of your gitlab server.
-                                E.g.: gitlab.parity.io
-
-    -t, --trigger-token         Gitlab trigger token. This must be defined in
-                                project -> settings -> CI/CD -> Pipeline triggers
-                                Defaults to CI_JOB_TOKEN
-                                https://stackoverflow.com/questions/42746634/gitlab-trigger-api-returns-404
-
-    -a, --access-token          Gitlab  peronal access token or it defaults to
-                                PIPELINE_TOKEN (gitlab variable)
-                                https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html
-
-EXAMPLES
-  ${SCRIPT_NAME} -s v4
-  ${SCRIPT_NAME} --simnet-version=v4
-
-  Local test example. You need to set the 2 vars before running: TR_TOKEN and PERS_TOKEN
-  ${SCRIPT_NAME} --simnet-version=v4 \\
-                 --upstream-project=substrate \\
-                 --upstream-ref=master \\
-                 --image-name=docker.io/paritypr/synth-wave \\
-                 --image-tag=master \\
-                 --collator-image-tag=master \\
-                 --ci-server-fqdn=gitlab.parity.io \\
-                 --downstream-id=332 \\
-                 --trigger-token="\${TR_TOKEN}" \\
-                 --access-token="\${PERS_TOKEN}"
-EOF
-}
-
-function main {
-  # Main entry point for the script.
-  parse_args "$@"
-  check_args
-  trigger_pipeline
-  check_pipeline
-  poll_pipeline
-}
-
-function parse_args {
-  # shellcheck disable=SC2214
-  while getopts c:u:r:i:n:g:t:r:a:s:h-: OPT; do
-    # support long options: https://stackoverflow.com/a/28466267/519360
-    if [ "${OPT}" = "-" ]; then   # long option: reformulate OPT and OPTARG
-      OPT="${OPTARG%%=*}"         # extract long option name
-      OPTARG="${OPTARG#$OPT}"     # extract long option argument (may be empty)
-      OPTARG="${OPTARG#=}"        # if long option argument, remove assigning `=`
-    fi
-    case "${OPT}" in
-      h | help )                usage     ; exit 0 ;;
-      s | simnet-version )      needs_arg ; SIMNET_VERSION="${OPTARG}" ;;
-      u | upstream-project )    needs_arg ; TRGR_PROJECT="${OPTARG}" ;;
-      r | upstream-ref )        needs_arg ; TRGR_REF="${OPTARG}" ;;
-      n | image-name )          needs_arg ; IMAGE_NAME="${OPTARG}" ;;
-      i | image-tag )           needs_arg ; IMAGE_TAG="${OPTARG}" ;;
-      c | collator-image-tag )  needs_arg ; COLLATOR_IMAGE_TAG="${OPTARG}" ;;
-      g | ci-server-fqdn )      needs_arg ; CI_SERVER_HOST="${OPTARG}" ;;
-      d | downstream-id )       needs_arg ; DWNSTRM_ID="${OPTARG}" ;;
-      t | trigger-token )       needs_arg ; CI_JOB_TOKEN="${OPTARG}" ;;
-      a | access-token )        needs_arg ; PIPELINE_TOKEN="${OPTARG}" ;;
-      ??* )                     log DIE "Illegal option --${OPT}" ;;  # bad long option
-      ? )                       exit 2 ;;  # bad short option (error reported via getopts)
-    esac
-  done
-  shift $((OPTIND-1)) # remove parsed options and args from $@ list
-
-}
-
-function check_args {
-  if [[ -z "${SIMNET_VERSION}" ]] ; then
-    log DIE "Must specify value for mandatory argument -s,--simnet-version
-
-$(usage)"
-  fi
-}
-
-function needs_arg {
-  if [ -z "${OPTARG}" ]; then
-    log DIE "No arg for --${OPT} option"
-  fi
-}
-
-function trigger_pipeline {
-  # API trigger another project's pipeline.
-  log INFO "Triggering Simnet pipeline."
-
-  curl --silent \
-      -X POST \
-      -F "token=${CI_JOB_TOKEN}" \
-      -F "ref=${SIMNET_VERSION}" \
-      -F "variables[TRGR_PROJECT]=${TRGR_PROJECT}" \
-      -F "variables[TRGR_REF]=${TRGR_REF}" \
-      -F "variables[IMAGE_NAME]=${IMAGE_NAME}" \
-      -F "variables[IMAGE_TAG]=${IMAGE_TAG}" \
-      "https://${CI_SERVER_HOST}/api/v4/projects/${DWNSTRM_ID}/trigger/pipeline" | \
-          tee pipeline;
-}
-
-function check_pipeline {
-  PIPELINE_ID=$(jq ".id" pipeline)
-  PIPELINE_URL=$(jq ".web_url" pipeline)
-  echo
-  log INFO "Simnet pipeline ${PIPELINE_URL} was successfully triggered."
-  log INFO "Now we're polling it to obtain the distinguished status."
-}
-
-function poll_pipeline {
-  # This is a workaround for a Gitlab bug, waits here until
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/326137 gets fixed.
-  # The timeout is 360 curls with 8 sec interval, roughly an hour.
-  log INFO "Waiting on ${PIPELINE_ID} status..."
-
-# shellcheck disable=SC2034
-  for i in {1..360}; do
-      STATUS=$(get_status);
-      log INFO "Triggered pipeline status is ${STATUS}";
-      if [[ ${STATUS} =~ ^(pending|running|created)$ ]]; then
-          echo;
-      elif [[ ${STATUS} =~ ^(failed|canceled|skipped|manual)$ ]]; then
-          log DIE "Something's broken in: ${PIPELINE_URL}";
-      elif [[ ${STATUS} =~ ^(success)$ ]]; then
-          log INFO "Look how green it is: ${PIPELINE_URL}"
-          exit 0
-      else
-          log DIE "Something else has happened in ${PIPELINE_URL}"
-      fi
-  sleep 8;
-  done
-}
-
-function get_status() {
-    curl --silent \
-        --header "PRIVATE-TOKEN: ${PIPELINE_TOKEN}" \
-        "https://${CI_SERVER_HOST}/api/v4/projects/${DWNSTRM_ID}/pipelines/${PIPELINE_ID}" | \
-            jq --raw-output ".status";
-}
-
-function log {
-  local lvl msg fmt
-  lvl=$1 msg=$2
-  fmt='+%Y-%m-%d %H:%M:%S'
-  lg_date=$(date "${fmt}")
-  if [[ "${lvl}" = "DIE" ]] ; then
-    lvl="ERROR"
-    echo  "${lg_date} - ${lvl} - ${msg}"
-    exit 1
-  else
-    echo "${lg_date} - ${lvl} - ${msg}"
-  fi
-}
-
-main "$@"

From 2e6c18151d07ee3d8d6a2663c9955e8cd3f01c4d Mon Sep 17 00:00:00 2001
From: radupopa2010 <radupopa2010@yahoo.com>
Date: Wed, 18 Aug 2021 12:20:45 +0200
Subject: [PATCH 05/11] echo config of simnet tests

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 53f8e2e1c2dcb..cbc017ca957b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -729,13 +729,14 @@ deploy-prometheus-alerting-rules:
         - .gitlab-ci.yml
         - .maintain/monitoring/**/*
 
-# Runs "quick" and "long" tests on nightly schedule.A Quick test is a smoke test
-# where basic check-expect tests run based on checking values from metrics
-# Long Test is the load testing where we send 50K transactions into the network
+# Runs "quick" and "long" tests on nightly schedule. 
+# A "quick" test is a smoke test where basic check-expect tests run by
+# checking values from metrics exposed by the app.
+# A "long" test is the load testing where we send 50K transactions into the 
+# network and check if all completed successfully
 simnet-tests:
   stage:                           deploy
-  # fixme: replace v8 with $SIMNET_REF on line below
-  image:                           docker.io/paritytech/simnet:v8
+  image:                           docker.io/paritytech/simnet:${SIMNET_REF}
   <<:                              *kubernetes-env
   rules:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
@@ -748,6 +749,10 @@ simnet-tests:
   # `build.env` brings here `${SUBSTRATE_IMAGE_NAME}` and `${SUBSTRATE_IMAGE_TAG}`
   # (`$VERSION` here, # i.e. `2643-0.8.29-5f689e0a-6b24dc54`).
   # ${SIMNET_REF} is a gitlab variable
+before_script:
+  - echo "Simnet Tests Config: 
+    docker.io/paritytech/simnet:${SIMNET_REF}
+    ${SUBSTRATE_IMAGE_NAME} ${SUBSTRATE_IAMGE_TAG}"
   script:
     - /home/nonroot/simnet/gurke/scripts/run-test-environment-manager.sh
         --github-remote-dir="https://github.com/paritytech/substrate/tree/master/simnet_tests"

From d8d8cb4d367f49cf589e5b71de3f79b335552527 Mon Sep 17 00:00:00 2001
From: radupopa2010 <radupopa2010@yahoo.com>
Date: Wed, 18 Aug 2021 12:51:11 +0200
Subject: [PATCH 06/11] use proper identation and rm : to fix ci-lint

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cbc017ca957b6..6801728dc4455 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -749,10 +749,10 @@ simnet-tests:
   # `build.env` brings here `${SUBSTRATE_IMAGE_NAME}` and `${SUBSTRATE_IMAGE_TAG}`
   # (`$VERSION` here, # i.e. `2643-0.8.29-5f689e0a-6b24dc54`).
   # ${SIMNET_REF} is a gitlab variable
-before_script:
-  - echo "Simnet Tests Config: 
-    docker.io/paritytech/simnet:${SIMNET_REF}
-    ${SUBSTRATE_IMAGE_NAME} ${SUBSTRATE_IAMGE_TAG}"
+  before_script:
+    - echo "Simnet Tests Config
+      docker.io/paritytech/simnet:${SIMNET_REF}
+      ${SUBSTRATE_IMAGE_NAME} ${SUBSTRATE_IAMGE_TAG}"
   script:
     - /home/nonroot/simnet/gurke/scripts/run-test-environment-manager.sh
         --github-remote-dir="https://github.com/paritytech/substrate/tree/master/simnet_tests"

From 1ec1ae398ede7c919d6d8f9b3d495bb7728f44e1 Mon Sep 17 00:00:00 2001
From: radupopa2010 <radupopa2010@yahoo.com>
Date: Wed, 18 Aug 2021 13:07:04 +0200
Subject: [PATCH 07/11] Update .gitlab-ci.yml

Co-authored-by: Denis Pisarev <denis.pisarev@parity.io>
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6801728dc4455..2fd1f1a174129 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -751,8 +751,8 @@ simnet-tests:
   # ${SIMNET_REF} is a gitlab variable
   before_script:
     - echo "Simnet Tests Config
-      docker.io/paritytech/simnet:${SIMNET_REF}
-      ${SUBSTRATE_IMAGE_NAME} ${SUBSTRATE_IAMGE_TAG}"
+        docker.io/paritytech/simnet:${SIMNET_REF}
+        ${SUBSTRATE_IMAGE_NAME} ${SUBSTRATE_IAMGE_TAG}"
   script:
     - /home/nonroot/simnet/gurke/scripts/run-test-environment-manager.sh
         --github-remote-dir="https://github.com/paritytech/substrate/tree/master/simnet_tests"

From 75bae1b1ad9025a95b4ce221a54d6640513946b2 Mon Sep 17 00:00:00 2001
From: radupopa2010 <radupopa2010@yahoo.com>
Date: Wed, 18 Aug 2021 13:12:22 +0200
Subject: [PATCH 08/11] fix description for tets

---
 .gitlab-ci.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2fd1f1a174129..c21c8201b3341 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,6 +121,8 @@ default:
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME == "master"
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+      variables:
 
 .nightly-pipeline:                 &nightly-pipeline
   rules:
@@ -729,7 +731,7 @@ deploy-prometheus-alerting-rules:
         - .gitlab-ci.yml
         - .maintain/monitoring/**/*
 
-# Runs "quick" and "long" tests on nightly schedule. 
+# Runs "quick" and "long" tests on nightly schedule and on commit / merge to master
 # A "quick" test is a smoke test where basic check-expect tests run by
 # checking values from metrics exposed by the app.
 # A "long" test is the load testing where we send 50K transactions into the 
@@ -751,8 +753,8 @@ simnet-tests:
   # ${SIMNET_REF} is a gitlab variable
   before_script:
     - echo "Simnet Tests Config
-        docker.io/paritytech/simnet:${SIMNET_REF}
-        ${SUBSTRATE_IMAGE_NAME} ${SUBSTRATE_IAMGE_TAG}"
+      docker.io/paritytech/simnet:${SIMNET_REF}
+      ${SUBSTRATE_IMAGE_NAME} ${SUBSTRATE_IAMGE_TAG}"
   script:
     - /home/nonroot/simnet/gurke/scripts/run-test-environment-manager.sh
         --github-remote-dir="https://github.com/paritytech/substrate/tree/master/simnet_tests"

From a7aded57e58dab3a8a6d4427ff7162d2c22f33c3 Mon Sep 17 00:00:00 2001
From: radupopa2010 <radupopa2010@yahoo.com>
Date: Wed, 18 Aug 2021 14:06:16 +0200
Subject: [PATCH 09/11] rm build for PRs from this branch

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c21c8201b3341..73a8688a625db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,7 +121,6 @@ default:
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME == "master"
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
       variables:
 
 .nightly-pipeline:                 &nightly-pipeline

From 61fd4bbb150bbd0682ebd39288e5338bb9af902d Mon Sep 17 00:00:00 2001
From: radupopa2010 <radupopa2010@yahoo.com>
Date: Wed, 18 Aug 2021 15:06:26 +0200
Subject: [PATCH 10/11] dummy trigger ci

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73a8688a625db..352f8a6cb9c31 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -762,4 +762,3 @@ simnet-tests:
   retry: 2
   tags:
     - parity-simnet
-

From b78fa56fe71663f7ba3ce050f71495ec460bb8cf Mon Sep 17 00:00:00 2001
From: radupopa2010 <radupopa2010@yahoo.com>
Date: Wed, 18 Aug 2021 15:19:52 +0200
Subject: [PATCH 11/11] rm content for future PR

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 352f8a6cb9c31..f969227fcb898 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,7 +121,6 @@ default:
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME == "master"
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
-      variables:
 
 .nightly-pipeline:                 &nightly-pipeline
   rules: