From 0c51a202cce7a8a3925c28a50121fcfdcba01108 Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Tue, 7 Mar 2023 08:28:53 -0300
Subject: [PATCH] bump `zombienet` version to v1.3.37 (#6773)
* bump zombienet version
* remove redundant 'is up' assertion
* bump zombienet version
* bump to latest version of zombienet
* add more time to check peers
---
polkadot/.gitlab-ci.yml | 2 +-
.../functional/0001-parachains-pvf.zndsl | 26 ++++++-------------
.../functional/0002-parachains-disputes.zndsl | 9 -------
.../functional/0003-beefy-and-mmr.zndsl | 6 -----
.../0003-parachains-garbage-candidate.zndsl | 5 ----
.../zombienet_tests/misc/0001-paritydb.zndsl | 11 --------
.../misc/0002-upgrade-node.zndsl | 5 ----
.../smoke/0001-parachains-smoke-test.zndsl | 3 ---
.../0002-parachains-upgrade-smoke-test.zndsl | 3 ---
...-deregister-register-validator-smoke.zndsl | 5 ----
10 files changed, 9 insertions(+), 66 deletions(-)
diff --git a/polkadot/.gitlab-ci.yml b/polkadot/.gitlab-ci.yml
index 9da8680c62f..7ec774723e7 100644
--- a/polkadot/.gitlab-ci.yml
+++ b/polkadot/.gitlab-ci.yml
@@ -36,7 +36,7 @@ variables:
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.27"
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
- ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.78"
+ ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.37"
default:
cache: {}
diff --git a/polkadot/zombienet_tests/functional/0001-parachains-pvf.zndsl b/polkadot/zombienet_tests/functional/0001-parachains-pvf.zndsl
index e54c4c6ee41..46bb8bcdf72 100644
--- a/polkadot/zombienet_tests/functional/0001-parachains-pvf.zndsl
+++ b/polkadot/zombienet_tests/functional/0001-parachains-pvf.zndsl
@@ -2,16 +2,6 @@ Description: PVF preparation & execution time
Network: ./0001-parachains-pvf.toml
Creds: config
-# Some sanity checks
-alice: is up
-bob: is up
-charlie: is up
-dave: is up
-eve: is up
-ferdie: is up
-one: is up
-two: is up
-
# Check authority status.
alice: reports node_roles is 4
bob: reports node_roles is 4
@@ -54,14 +44,14 @@ one: reports histogram polkadot_pvf_preparation_time has at least 1 samples in b
two: reports histogram polkadot_pvf_preparation_time has at least 1 samples in buckets ["0.1", "0.5", "1", "2", "3", "10"] within 10 seconds
# Check all buckets >= 20.
-alice: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["20", "30", "60", "180", "+Inf"] within 10 seconds
-bob: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["20", "30", "60", "180", "+Inf"] within 10 seconds
-charlie: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["20", "30", "60", "180", "+Inf"] within 10 seconds
-dave: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["20", "30", "60", "180", "+Inf"] within 10 seconds
-ferdie: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["20", "30", "60", "180", "+Inf"] within 10 seconds
-eve: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["20", "30", "60", "180", "+Inf"] within 10 seconds
-one: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["20", "30", "60", "180", "+Inf"] within 10 seconds
-two: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["20", "30", "60", "180", "+Inf"] within 10 seconds
+alice: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["20", "30", "60", "120", "+Inf"] within 10 seconds
+bob: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["20", "30", "60", "120", "+Inf"] within 10 seconds
+charlie: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["20", "30", "60", "120", "+Inf"] within 10 seconds
+dave: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["20", "30", "60", "120", "+Inf"] within 10 seconds
+ferdie: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["20", "30", "60", "120", "+Inf"] within 10 seconds
+eve: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["20", "30", "60", "120", "+Inf"] within 10 seconds
+one: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["20", "30", "60", "120", "+Inf"] within 10 seconds
+two: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["20", "30", "60", "120", "+Inf"] within 10 seconds
# Check execution time.
# There are two different timeout conditions: BACKING_EXECUTION_TIMEOUT(2s) and
diff --git a/polkadot/zombienet_tests/functional/0002-parachains-disputes.zndsl b/polkadot/zombienet_tests/functional/0002-parachains-disputes.zndsl
index 5745da68010..e17ac79399f 100644
--- a/polkadot/zombienet_tests/functional/0002-parachains-disputes.zndsl
+++ b/polkadot/zombienet_tests/functional/0002-parachains-disputes.zndsl
@@ -2,15 +2,6 @@ Description: Disputes initiation, conclusion and lag
Network: ./0002-parachains-disputes.toml
Creds: config
-alice: is up
-bob: is up
-charlie: is up
-dave: is up
-eve: is up
-ferdie: is up
-one: is up
-two: is up
-
# Check authority status and peers.
alice: reports node_roles is 4
bob: reports node_roles is 4
diff --git a/polkadot/zombienet_tests/functional/0003-beefy-and-mmr.zndsl b/polkadot/zombienet_tests/functional/0003-beefy-and-mmr.zndsl
index fad890bec9e..c927a671658 100644
--- a/polkadot/zombienet_tests/functional/0003-beefy-and-mmr.zndsl
+++ b/polkadot/zombienet_tests/functional/0003-beefy-and-mmr.zndsl
@@ -2,12 +2,6 @@ Description: Test BEEFY voting and finality, test MMR proofs. Assumes Rococo ses
Network: ./0003-beefy-and-mmr.toml
Creds: config
-# Some sanity checks.
-validator-0: is up
-validator-1: is up
-validator-2: is up
-validator-3: is up
-
# Check authority status.
validator-0: reports node_roles is 4
validator-1: reports node_roles is 4
diff --git a/polkadot/zombienet_tests/functional/0003-parachains-garbage-candidate.zndsl b/polkadot/zombienet_tests/functional/0003-parachains-garbage-candidate.zndsl
index 71e93fcf359..c4b2dbf20a1 100644
--- a/polkadot/zombienet_tests/functional/0003-parachains-garbage-candidate.zndsl
+++ b/polkadot/zombienet_tests/functional/0003-parachains-garbage-candidate.zndsl
@@ -2,11 +2,6 @@ Description: Test dispute finality lag when 1/3 of parachain validators always a
Network: ./0003-parachains-garbage-candidate.toml
Creds: config
-honest-validator-0: is up
-honest-validator-1: is up
-honest-validator-2: is up
-malus-validator-0: is up
-
# Check authority status.
honest-validator-0: reports node_roles is 4
honest-validator-1: reports node_roles is 4
diff --git a/polkadot/zombienet_tests/misc/0001-paritydb.zndsl b/polkadot/zombienet_tests/misc/0001-paritydb.zndsl
index ae0e2bdb6c3..eede8bc1114 100644
--- a/polkadot/zombienet_tests/misc/0001-paritydb.zndsl
+++ b/polkadot/zombienet_tests/misc/0001-paritydb.zndsl
@@ -2,17 +2,6 @@ Description: Check that paritydb works without affecting finality lag and block
Network: ./0001-paritydb.toml
Creds: config
-validator-0: is up
-validator-1: is up
-validator-2: is up
-validator-3: is up
-validator-4: is up
-validator-5: is up
-validator-6: is up
-validator-7: is up
-validator-8: is up
-validator-9: is up
-
# Check if we are using ParityDB.
validator: log line contains "Database: ParityDb"
validator: run ./0001-check_paritydb.sh within 60 seconds
diff --git a/polkadot/zombienet_tests/misc/0002-upgrade-node.zndsl b/polkadot/zombienet_tests/misc/0002-upgrade-node.zndsl
index 6d0bd643c4f..25f87528d62 100644
--- a/polkadot/zombienet_tests/misc/0002-upgrade-node.zndsl
+++ b/polkadot/zombienet_tests/misc/0002-upgrade-node.zndsl
@@ -2,11 +2,6 @@ Description: Smoke / Upgrade Node
Network: ./0002-upgrade-node.toml
Creds: config
-alice: is up
-bob: is up
-charlie: is up
-dave: is up
-
alice: parachain 2000 block height is at least 10 within 200 seconds
bob: parachain 2001 block height is at least 10 within 200 seconds
diff --git a/polkadot/zombienet_tests/smoke/0001-parachains-smoke-test.zndsl b/polkadot/zombienet_tests/smoke/0001-parachains-smoke-test.zndsl
index cf5668a856d..13d0624158f 100644
--- a/polkadot/zombienet_tests/smoke/0001-parachains-smoke-test.zndsl
+++ b/polkadot/zombienet_tests/smoke/0001-parachains-smoke-test.zndsl
@@ -2,8 +2,5 @@ Description: Smoke Test
Network: ./0001-parachains-smoke-test.toml
Creds: config
-
-alice: is up
-bob: is up
alice: parachain 100 is registered within 225 seconds
alice: parachain 100 block height is at least 10 within 200 seconds
diff --git a/polkadot/zombienet_tests/smoke/0002-parachains-upgrade-smoke-test.zndsl b/polkadot/zombienet_tests/smoke/0002-parachains-upgrade-smoke-test.zndsl
index ac8f35a6ce5..fec28455f5f 100644
--- a/polkadot/zombienet_tests/smoke/0002-parachains-upgrade-smoke-test.zndsl
+++ b/polkadot/zombienet_tests/smoke/0002-parachains-upgrade-smoke-test.zndsl
@@ -2,9 +2,6 @@ Description: Smoke Test
Network: ./0002-parachains-upgrade-smoke-test.toml
Creds: config
-
-alice: is up
-bob: is up
alice: parachain 100 is registered within 225 seconds
alice: parachain 100 block height is at least 10 within 400 seconds
alice: parachain 100 perform dummy upgrade within 200 seconds
diff --git a/polkadot/zombienet_tests/smoke/0003-deregister-register-validator-smoke.zndsl b/polkadot/zombienet_tests/smoke/0003-deregister-register-validator-smoke.zndsl
index 6a79c4cb071..05e83110e4f 100644
--- a/polkadot/zombienet_tests/smoke/0003-deregister-register-validator-smoke.zndsl
+++ b/polkadot/zombienet_tests/smoke/0003-deregister-register-validator-smoke.zndsl
@@ -2,11 +2,6 @@ Description: Deregister / Register Validator Smoke
Network: ./0003-deregister-register-validator-smoke.toml
Creds: config
-alice: is up within 30 seconds
-bob: is up within 30 seconds
-charlie: is up within 30 seconds
-dave: is up within 30 seconds
-
# ensure is in the validator set
dave: reports polkadot_node_is_parachain_validator is 1 within 240 secs
dave: reports polkadot_node_is_active_validator is 1 within 240 secs
--
GitLab