Merge branch 'master' into rh-async-backing-feature

paritytech · Nov 28, 2022 · aacb2b3 · aacb2b3
2 parents 8b1eb15 + 1b1bc62
commit aacb2b3
Show file tree

Hide file tree

Showing 62 changed files with 1,212 additions and 737 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -33,13 +33,21 @@ variables:
   GIT_DEPTH:                       100
   CI_SERVER_NAME:                  "GitLab CI"
   CI_IMAGE:                        "paritytech/ci-linux:production"
+  BUILDAH_IMAGE:                   "quay.io/buildah/stable:v1.27"
   DOCKER_OS:                       "debian:stretch"
   ARCH:                            "x86_64"
   ZOMBIENET_IMAGE:                 "docker.io/paritytech/zombienet:v1.2.78"
   PIPELINE_SCRIPTS_TAG:            "v0.4"
 
 default:
   cache:                           {}
+  retry:
+    max: 2
+    when:
+      - runner_system_failure
+      - unknown_failure
+      - api_failure
+  interruptible:                   true
 
 .collect-artifacts:
   artifacts:
@@ -72,25 +80,12 @@ default:
        dotenv: pipeline-stopper.env
 
 .kubernetes-env:
-  retry:
-    max: 2
-    when:
-      - runner_system_failure
-      - unknown_failure
-      - api_failure
-  interruptible:                   true
+  image:                           "${CI_IMAGE}"
   tags:
     - kubernetes-parity-build
 
 .docker-env:
   image:                           "${CI_IMAGE}"
-  retry:
-    max: 2
-    when:
-      - runner_system_failure
-      - unknown_failure
-      - api_failure
-  interruptible:                   true
   tags:
     - linux-docker
 
@@ -150,9 +145,6 @@ default:
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
 
 .build-push-image:
-  extends:
-    - .kubernetes-env
-  image:                           quay.io/buildah/stable
   before_script:
     - test -s ./artifacts/VERSION || exit 1
     - test -s ./artifacts/EXTRATAG || exit 1
@@ -196,8 +188,6 @@ include:
   # zombienet jobs
   - scripts/ci/gitlab/pipeline/zombienet.yml
 
-
-
 #### stage:                        .post
 
 deploy-parity-testnet:
@@ -227,8 +217,24 @@ deploy-parity-testnet:
     PR_NUM:                        "${PR_NUM}"
   trigger:
     project:                       "parity/infrastructure/ci_cd/pipeline-stopper"
+    branch:                        "as-improve"
+
+remove-cancel-pipeline-message:
+  stage: .post
+  rules:
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+  variables:
+    PROJECT_ID:                    "${CI_PROJECT_ID}"
+    PROJECT_NAME:                  "${CI_PROJECT_NAME}"
+    PIPELINE_ID:                   "${CI_PIPELINE_ID}"
+    FAILED_JOB_URL:                "https://gitlab.com"
+    FAILED_JOB_NAME:               "nope"
+    PR_NUM:                        "${CI_COMMIT_REF_NAME}"
+  trigger:
+    project:                       "parity/infrastructure/ci_cd/pipeline-stopper"
+    branch:                        "as-improve"
 
-.cancel-pipeline-test-linux-stable:
+cancel-pipeline-test-linux-stable:
   extends:                         .cancel-pipeline-template
   needs:
     - job:                         test-linux-stable