Skip to content

Commit b46f07f

Browse files
sandreimpepoviola
andauthored
Fix polkadot zombienet tests (paritytech#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>
1 parent 31c7947 commit b46f07f

5 files changed

Lines changed: 43 additions & 6 deletions

File tree

.gitlab/pipeline/zombienet/polkadot.yml

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,24 @@
44
# common settings for all zombienet jobs
55
.zombienet-polkadot-common:
66
before_script:
7+
- export BUILD_RELEASE_VERSION="$(cat ./artifacts/BUILD_RELEASE_VERSION)" # from build-linux-stable job
78
- export DEBUG=zombie,zombie::network-node
89
- export ZOMBIENET_INTEGRATION_TEST_IMAGE="${POLKADOT_IMAGE}":${PIPELINE_IMAGE_TAG}
10+
- export ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE="docker.io/parity/polkadot:${BUILD_RELEASE_VERSION}"
911
- export COL_IMAGE="${COLANDER_IMAGE}":${PIPELINE_IMAGE_TAG}
1012
- export MALUS_IMAGE="${MALUS_IMAGE}":${PIPELINE_IMAGE_TAG}
1113
- echo "Zombienet Tests Config"
1214
- echo "gh-dir ${GH_DIR}"
1315
- echo "local-dir ${LOCAL_DIR}"
1416
- echo "polkadot image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
17+
- echo "polkadot secondary image ${ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE}"
1518
- echo "colander image ${COL_IMAGE}"
1619
- echo "malus image ${MALUS_IMAGE}"
1720
stage: zombienet
1821
image: "${ZOMBIENET_IMAGE}"
1922
needs:
23+
- job: build-linux-stable
24+
artifacts: true
2025
- job: build-push-image-malus
2126
artifacts: true
2227
- job: build-push-image-polkadot-debug
@@ -64,21 +69,29 @@ zombienet-polkadot-functional-0002-parachains-disputes:
6469
--local-dir="${LOCAL_DIR}/functional"
6570
--test="0002-parachains-disputes.zndsl"
6671

67-
zombienet-polkadot-functional-0003-parachains-disputes-garbage-candidate:
72+
zombienet-polkadot-functional-0003-beefy-and-mmr:
6873
extends:
6974
- .zombienet-polkadot-common
7075
script:
7176
- /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
7277
--local-dir="${LOCAL_DIR}/functional"
73-
--test="0003-parachains-garbage-candidate.zndsl"
78+
--test="0003-beefy-and-mmr.zndsl"
7479

75-
zombienet-polkadot-functional-0004-beefy-and-mmr:
80+
zombienet-polkadot-functional-0004-parachains-disputes-garbage-candidate:
7681
extends:
7782
- .zombienet-polkadot-common
7883
script:
7984
- /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
8085
--local-dir="${LOCAL_DIR}/functional"
81-
--test="0003-beefy-and-mmr.zndsl"
86+
--test="0004-parachains-garbage-candidate.zndsl"
87+
88+
zombienet-polkadot-functional-0005-parachains-disputes-past-session:
89+
extends:
90+
- .zombienet-polkadot-common
91+
script:
92+
- /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
93+
--local-dir="${LOCAL_DIR}/functional"
94+
--test="0005-parachains-disputes-past-session.zndsl"
8295

8396
zombienet-polkadot-smoke-0001-parachains-smoke-test:
8497
extends:
@@ -168,3 +181,27 @@ zombienet-polkadot-malus-0001-dispute-valid:
168181
- /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
169182
--local-dir="${LOCAL_DIR}/integrationtests"
170183
--test="0001-dispute-valid-block.zndsl"
184+
185+
zombienet-polkadot-async-backing-compatibility:
186+
extends:
187+
- .zombienet-polkadot-common
188+
script:
189+
- /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
190+
--local-dir="${LOCAL_DIR}/async_backing"
191+
--test="001-async-backing-compatibility.zndsl"
192+
193+
zombienet-polkadot-async-backing-runtime-upgrade:
194+
extends:
195+
- .zombienet-polkadot-common
196+
script:
197+
- /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
198+
--local-dir="${LOCAL_DIR}/async_backing"
199+
--test="002-async-backing-runtime-upgrade.zndsl"
200+
201+
zombienet-polkadot-async-backing-collator-mix:
202+
extends:
203+
- .zombienet-polkadot-common
204+
script:
205+
- /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
206+
--local-dir="${LOCAL_DIR}/async_backing"
207+
--test="003-async-backing-collator-mix.zndsl"

polkadot/zombienet_tests/functional/0003-parachains-garbage-candidate.toml renamed to polkadot/zombienet_tests/functional/0004-parachains-garbage-candidate.toml

File renamed without changes.

polkadot/zombienet_tests/functional/0003-parachains-garbage-candidate.zndsl renamed to polkadot/zombienet_tests/functional/0004-parachains-garbage-candidate.zndsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Description: Test dispute finality lag when 1/3 of parachain validators always attempt to include an invalid block
2-
Network: ./0003-parachains-garbage-candidate.toml
2+
Network: ./0004-parachains-garbage-candidate.toml
33
Creds: config
44

55
# Check authority status.

polkadot/zombienet_tests/functional/0004-parachains-disputes-past-session.toml renamed to polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.toml

File renamed without changes.

polkadot/zombienet_tests/functional/0004-parachains-disputes-past-session.zndsl renamed to polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.zndsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Description: Past-session dispute slashing
2-
Network: ./0004-parachains-disputes-past-session.toml
2+
Network: ./0005-parachains-disputes-past-session.toml
33
Creds: config
44

55
# Ensure nodes are up and running

0 commit comments

Comments
 (0)