From b46f07ff7144b40051fd995d77a8fbd808ecc238 Mon Sep 17 00:00:00 2001
From: Andrei Sandu <54316454+sandreim@users.noreply.github.com>
Date: Wed, 30 Aug 2023 17:58:37 +0300
Subject: [PATCH] Fix polkadot zombienet tests (#1276)
* fix tests
Signed-off-by: Andrei Sandu <andrei-mihail@parity.io>
* ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE
Signed-off-by: Andrei Sandu <andrei-mihail@parity.io>
* deleted by mistake
Signed-off-by: Andrei Sandu <andrei-mihail@parity.io>
* remove LOCAL_DIR override
Signed-off-by: Andrei Sandu <andrei-mihail@parity.io>
* Fix secondary image
Signed-off-by: Andrei Sandu <andrei-mihail@parity.io>
* fix get BUILD_RELEASE_VERSION in pipeline
---------
Signed-off-by: Andrei Sandu <andrei-mihail@parity.io>
Co-authored-by: Javier Viola <javier@parity.io>
---
.gitlab/pipeline/zombienet/polkadot.yml | 45 +++++++++++++++++--
...=> 0004-parachains-garbage-candidate.toml} | 0
...> 0004-parachains-garbage-candidate.zndsl} | 2 +-
...005-parachains-disputes-past-session.toml} | 0
...05-parachains-disputes-past-session.zndsl} | 2 +-
5 files changed, 43 insertions(+), 6 deletions(-)
rename polkadot/zombienet_tests/functional/{0003-parachains-garbage-candidate.toml => 0004-parachains-garbage-candidate.toml} (100%)
rename polkadot/zombienet_tests/functional/{0003-parachains-garbage-candidate.zndsl => 0004-parachains-garbage-candidate.zndsl} (98%)
rename polkadot/zombienet_tests/functional/{0004-parachains-disputes-past-session.toml => 0005-parachains-disputes-past-session.toml} (100%)
rename polkadot/zombienet_tests/functional/{0004-parachains-disputes-past-session.zndsl => 0005-parachains-disputes-past-session.zndsl} (97%)
diff --git a/.gitlab/pipeline/zombienet/polkadot.yml b/.gitlab/pipeline/zombienet/polkadot.yml
index e4c56a7d620..87b821742c6 100644
--- a/.gitlab/pipeline/zombienet/polkadot.yml
+++ b/.gitlab/pipeline/zombienet/polkadot.yml
@@ -4,19 +4,24 @@
# common settings for all zombienet jobs
.zombienet-polkadot-common:
before_script:
+ - export BUILD_RELEASE_VERSION="$(cat ./artifacts/BUILD_RELEASE_VERSION)" # from build-linux-stable job
- export DEBUG=zombie,zombie::network-node
- export ZOMBIENET_INTEGRATION_TEST_IMAGE="${POLKADOT_IMAGE}":${PIPELINE_IMAGE_TAG}
+ - export ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE="docker.io/parity/polkadot:${BUILD_RELEASE_VERSION}"
- export COL_IMAGE="${COLANDER_IMAGE}":${PIPELINE_IMAGE_TAG}
- export MALUS_IMAGE="${MALUS_IMAGE}":${PIPELINE_IMAGE_TAG}
- echo "Zombienet Tests Config"
- echo "gh-dir ${GH_DIR}"
- echo "local-dir ${LOCAL_DIR}"
- echo "polkadot image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
+ - echo "polkadot secondary image ${ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE}"
- echo "colander image ${COL_IMAGE}"
- echo "malus image ${MALUS_IMAGE}"
stage: zombienet
image: "${ZOMBIENET_IMAGE}"
needs:
+ - job: build-linux-stable
+ artifacts: true
- job: build-push-image-malus
artifacts: true
- job: build-push-image-polkadot-debug
@@ -64,21 +69,29 @@ zombienet-polkadot-functional-0002-parachains-disputes:
--local-dir="${LOCAL_DIR}/functional"
--test="0002-parachains-disputes.zndsl"
-zombienet-polkadot-functional-0003-parachains-disputes-garbage-candidate:
+zombienet-polkadot-functional-0003-beefy-and-mmr:
extends:
- .zombienet-polkadot-common
script:
- /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
--local-dir="${LOCAL_DIR}/functional"
- --test="0003-parachains-garbage-candidate.zndsl"
+ --test="0003-beefy-and-mmr.zndsl"
-zombienet-polkadot-functional-0004-beefy-and-mmr:
+zombienet-polkadot-functional-0004-parachains-disputes-garbage-candidate:
extends:
- .zombienet-polkadot-common
script:
- /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
--local-dir="${LOCAL_DIR}/functional"
- --test="0003-beefy-and-mmr.zndsl"
+ --test="0004-parachains-garbage-candidate.zndsl"
+
+zombienet-polkadot-functional-0005-parachains-disputes-past-session:
+ extends:
+ - .zombienet-polkadot-common
+ script:
+ - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+ --local-dir="${LOCAL_DIR}/functional"
+ --test="0005-parachains-disputes-past-session.zndsl"
zombienet-polkadot-smoke-0001-parachains-smoke-test:
extends:
@@ -168,3 +181,27 @@ zombienet-polkadot-malus-0001-dispute-valid:
- /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
--local-dir="${LOCAL_DIR}/integrationtests"
--test="0001-dispute-valid-block.zndsl"
+
+zombienet-polkadot-async-backing-compatibility:
+ extends:
+ - .zombienet-polkadot-common
+ script:
+ - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+ --local-dir="${LOCAL_DIR}/async_backing"
+ --test="001-async-backing-compatibility.zndsl"
+
+zombienet-polkadot-async-backing-runtime-upgrade:
+ extends:
+ - .zombienet-polkadot-common
+ script:
+ - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+ --local-dir="${LOCAL_DIR}/async_backing"
+ --test="002-async-backing-runtime-upgrade.zndsl"
+
+zombienet-polkadot-async-backing-collator-mix:
+ extends:
+ - .zombienet-polkadot-common
+ script:
+ - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+ --local-dir="${LOCAL_DIR}/async_backing"
+ --test="003-async-backing-collator-mix.zndsl"
diff --git a/polkadot/zombienet_tests/functional/0003-parachains-garbage-candidate.toml b/polkadot/zombienet_tests/functional/0004-parachains-garbage-candidate.toml
similarity index 100%
rename from polkadot/zombienet_tests/functional/0003-parachains-garbage-candidate.toml
rename to polkadot/zombienet_tests/functional/0004-parachains-garbage-candidate.toml
diff --git a/polkadot/zombienet_tests/functional/0003-parachains-garbage-candidate.zndsl b/polkadot/zombienet_tests/functional/0004-parachains-garbage-candidate.zndsl
similarity index 98%
rename from polkadot/zombienet_tests/functional/0003-parachains-garbage-candidate.zndsl
rename to polkadot/zombienet_tests/functional/0004-parachains-garbage-candidate.zndsl
index c4fd3ee7c55..be2ae9504b8 100644
--- a/polkadot/zombienet_tests/functional/0003-parachains-garbage-candidate.zndsl
+++ b/polkadot/zombienet_tests/functional/0004-parachains-garbage-candidate.zndsl
@@ -1,5 +1,5 @@
Description: Test dispute finality lag when 1/3 of parachain validators always attempt to include an invalid block
-Network: ./0003-parachains-garbage-candidate.toml
+Network: ./0004-parachains-garbage-candidate.toml
Creds: config
# Check authority status.
diff --git a/polkadot/zombienet_tests/functional/0004-parachains-disputes-past-session.toml b/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.toml
similarity index 100%
rename from polkadot/zombienet_tests/functional/0004-parachains-disputes-past-session.toml
rename to polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.toml
diff --git a/polkadot/zombienet_tests/functional/0004-parachains-disputes-past-session.zndsl b/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.zndsl
similarity index 97%
rename from polkadot/zombienet_tests/functional/0004-parachains-disputes-past-session.zndsl
rename to polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.zndsl
index bf3fb0ac9de..bc3674f4f53 100644
--- a/polkadot/zombienet_tests/functional/0004-parachains-disputes-past-session.zndsl
+++ b/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.zndsl
@@ -1,5 +1,5 @@
Description: Past-session dispute slashing
-Network: ./0004-parachains-disputes-past-session.toml
+Network: ./0005-parachains-disputes-past-session.toml
Creds: config
# Ensure nodes are up and running
--
GitLab