Merge branch 'master' into sandreim/garbage_candidate_test

paritytech · Aug 10, 2022 · e3c8fcc · e3c8fcc
2 parents 2fff5c2 + 4863d0a
commit e3c8fcc
Show file tree

Hide file tree

Showing 22 changed files with 335 additions and 235 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ variables:
   CI_IMAGE:                        "paritytech/ci-linux:production"
   DOCKER_OS:                       "debian:stretch"
   ARCH:                            "x86_64"
-  ZOMBIENET_IMAGE:                 "docker.io/paritytech/zombienet:v1.2.25"
+  ZOMBIENET_IMAGE:                 "docker.io/paritytech/zombienet:v1.2.51"
   PIPELINE_SCRIPTS_TAG:            "v0.4"
 
 default:
@@ -770,9 +770,9 @@ zombienet-tests-parachains-disputes-garbage-candidate:
 
 zombienet-test-parachains-upgrade-smoke-test:
   stage:                           stage3
+  image:                           "${ZOMBIENET_IMAGE}"
   <<:                              *kubernetes-env
   <<:                              *zombienet-refs
-  image:                           "docker.io/paritytech/zombienet:v1.2.45"
   needs:
     - job:                         publish-polkadot-debug-image
     - job:                         publish-malus-image
@@ -799,9 +799,9 @@ zombienet-test-parachains-upgrade-smoke-test:
 
 zombienet-tests-misc-paritydb:
   stage:                           stage3
+  image:                           "${ZOMBIENET_IMAGE}"
   <<:                              *kubernetes-env
   <<:                              *zombienet-refs
-  image:                           "docker.io/paritytech/zombienet:v1.2.49"
   needs:
     - job:                         publish-polkadot-debug-image
     - job:                         publish-test-collators-image
@@ -857,7 +857,7 @@ zombienet-tests-malus-dispute-valid:
 
 zombienet-tests-deregister-register-validator:
   stage:                           stage3
-  image:                           "docker.io/paritytech/zombienet:v1.2.47"
+  image:                           "${ZOMBIENET_IMAGE}"
   <<:                              *kubernetes-env
   <<:                              *zombienet-refs
   needs:
@@ -882,6 +882,31 @@ zombienet-tests-deregister-register-validator:
   tags:
     - zombienet-polkadot-integration-test
 
+zombienet-tests-beefy-and-mmr:
+  stage:                           stage3
+  image:                           "${ZOMBIENET_IMAGE}"
+  <<:                              *kubernetes-env
+  <<:                              *zombienet-refs
+  needs:
+    - job:                         publish-polkadot-debug-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 "${GH_DIR}"
+    - export DEBUG=zombie*
+    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
+  script:
+    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
+      --github-remote-dir="${GH_DIR}"
+      --test="0003-beefy-and-mmr.feature"
+  allow_failure:                   true
+  retry: 2
+  tags:
+    - zombienet-polkadot-integration-test
+
 #### stage:                        stage4
 
 publish-rustdoc:
@@ -955,7 +980,7 @@ short-benchmark-polkadot:          &short-bench
   variables:
     RUNTIME:                       polkadot
   script:
-    - ./artifacts/polkadot benchmark pallet --execution wasm --wasm-execution compiled --chain $RUNTIME-dev --pallet "*" --extrinsic "*" --steps 1 --repeat 1
+    - ./artifacts/polkadot benchmark pallet --execution wasm --wasm-execution compiled --chain $RUNTIME-dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
 
 short-benchmark-kusama:
   <<:                              *short-bench