Merge origin/master

paritytech · Aug 15, 2022 · 09c24fd · 09c24fd
2 parents 37f1e3b + 8772d99
commit 09c24fd
Show file tree

Hide file tree

Showing 38 changed files with 1,043 additions and 341 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -172,7 +172,8 @@ check-runtime:
   stage:                           stage1
   image:                           paritytech/tools:latest
   <<:                              *kubernetes-env
-  <<:                              *test-refs
+  rules:
+    - if: $CI_COMMIT_REF_NAME =~ /^release-v[0-9]+\.[0-9]+.*$/      # i.e. release-v0.9.27
   variables:
     GITLAB_API:                    "https://gitlab.parity.io/api/v4"
     GITHUB_API_PROJECT:            "parity%2Finfrastructure%2Fgithub-api"
@@ -307,7 +308,7 @@ build-staking-miner:
   stage:                           stage2
   # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
   needs:
-    - job:                         check-runtime
+    - job:                         cargo-fmt
       artifacts:                   false
   <<:                              *docker-env
   <<:                              *test-pr-refs
@@ -336,7 +337,7 @@ test-node-metrics:
   stage:                           stage2
   # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
   needs:
-    - job:                         check-runtime
+    - job:                         cargo-fmt
       artifacts:                   false
   <<:                              *docker-env
   <<:                              *compiler-info
@@ -738,6 +739,36 @@ zombienet-tests-parachains-disputes:
   tags:
     - zombienet-polkadot-integration-test
 
+zombienet-tests-parachains-disputes-garbage-candidate:
+  stage:                           stage3
+  image:                           "${ZOMBIENET_IMAGE}"
+  <<:                              *kubernetes-env
+  <<:                              *zombienet-refs
+  needs:
+    - job:                         publish-polkadot-debug-image
+    - job:                         publish-test-collators-image
+    - job:                         publish-malus-image
+  variables:
+    GH_DIR:                        "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
+  before_script:
+    - echo "Zombie-net Tests Config"
+    - echo "${ZOMBIENET_IMAGE_NAME}"
+    - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
+    - echo "${MALUS_IMAGE_NAME} ${MALUS_IMAGE_TAG}"
+    - echo "${GH_DIR}"
+    - export DEBUG=zombie,zombie::network-node
+    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
+    - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
+    - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
+  script:
+    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
+        --github-remote-dir="${GH_DIR}"
+        --test="0003-parachains-garbage-candidate.feature"
+  allow_failure:                   false
+  retry: 2
+  tags:
+    - zombienet-polkadot-integration-test
+
 zombienet-test-parachains-upgrade-smoke-test:
   stage:                           stage3
   image:                           "${ZOMBIENET_IMAGE}"