From d6aab1a096fbe3ef5aacc85e029309ad0fd7bd1d Mon Sep 17 00:00:00 2001 From: Javier Viola Date: Thu, 23 Feb 2023 16:33:39 -0300 Subject: [PATCH 1/5] bump zombienet version --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d9300ba93a0..e90993eba3ad 100644 --- a/.gitlab-ci.yml +++ b/.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.35" default: cache: {} From 0821fcc2453b821fa7c6904224ea72928dea7557 Mon Sep 17 00:00:00 2001 From: Javier Viola Date: Thu, 23 Feb 2023 16:34:19 -0300 Subject: [PATCH 2/5] remove redundant 'is up' assertion --- zombienet_tests/functional/0001-parachains-pvf.zndsl | 10 ---------- .../functional/0002-parachains-disputes.zndsl | 9 --------- zombienet_tests/functional/0003-beefy-and-mmr.zndsl | 6 ------ .../0003-parachains-garbage-candidate.zndsl | 5 ----- zombienet_tests/misc/0001-paritydb.zndsl | 11 ----------- zombienet_tests/misc/0002-upgrade-node.zndsl | 5 ----- .../smoke/0001-parachains-smoke-test.zndsl | 3 --- .../smoke/0002-parachains-upgrade-smoke-test.zndsl | 3 --- .../0003-deregister-register-validator-smoke.zndsl | 5 ----- 9 files changed, 57 deletions(-) diff --git a/zombienet_tests/functional/0001-parachains-pvf.zndsl b/zombienet_tests/functional/0001-parachains-pvf.zndsl index 259f05b8f68b..ba7ee8f7d51e 100644 --- a/zombienet_tests/functional/0001-parachains-pvf.zndsl +++ b/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 diff --git a/zombienet_tests/functional/0002-parachains-disputes.zndsl b/zombienet_tests/functional/0002-parachains-disputes.zndsl index 357a380e1949..850a95734dd5 100644 --- a/zombienet_tests/functional/0002-parachains-disputes.zndsl +++ b/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/zombienet_tests/functional/0003-beefy-and-mmr.zndsl b/zombienet_tests/functional/0003-beefy-and-mmr.zndsl index fad890bec9e4..c927a671658d 100644 --- a/zombienet_tests/functional/0003-beefy-and-mmr.zndsl +++ b/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/zombienet_tests/functional/0003-parachains-garbage-candidate.zndsl b/zombienet_tests/functional/0003-parachains-garbage-candidate.zndsl index 71e93fcf359e..c4b2dbf20a17 100644 --- a/zombienet_tests/functional/0003-parachains-garbage-candidate.zndsl +++ b/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/zombienet_tests/misc/0001-paritydb.zndsl b/zombienet_tests/misc/0001-paritydb.zndsl index 7340fffb477e..57d9f68b1c97 100644 --- a/zombienet_tests/misc/0001-paritydb.zndsl +++ b/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/zombienet_tests/misc/0002-upgrade-node.zndsl b/zombienet_tests/misc/0002-upgrade-node.zndsl index 6d0bd643c4f9..25f87528d627 100644 --- a/zombienet_tests/misc/0002-upgrade-node.zndsl +++ b/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/zombienet_tests/smoke/0001-parachains-smoke-test.zndsl b/zombienet_tests/smoke/0001-parachains-smoke-test.zndsl index cf5668a856d0..13d0624158f2 100644 --- a/zombienet_tests/smoke/0001-parachains-smoke-test.zndsl +++ b/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/zombienet_tests/smoke/0002-parachains-upgrade-smoke-test.zndsl b/zombienet_tests/smoke/0002-parachains-upgrade-smoke-test.zndsl index ac8f35a6ce5e..fec28455f5f2 100644 --- a/zombienet_tests/smoke/0002-parachains-upgrade-smoke-test.zndsl +++ b/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/zombienet_tests/smoke/0003-deregister-register-validator-smoke.zndsl b/zombienet_tests/smoke/0003-deregister-register-validator-smoke.zndsl index 6a79c4cb071d..05e83110e4fe 100644 --- a/zombienet_tests/smoke/0003-deregister-register-validator-smoke.zndsl +++ b/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 From c4dad4ca85fed9a1ced3e005120b272c7871c589 Mon Sep 17 00:00:00 2001 From: Javier Viola Date: Fri, 24 Feb 2023 08:19:47 -0300 Subject: [PATCH 3/5] bump zombienet version --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e90993eba3ad..92ce729a4fbe 100644 --- a/.gitlab-ci.yml +++ b/.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.3.35" + ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.36" default: cache: {} From 67b10a5723901301a577178f45ef8e75b24e304d Mon Sep 17 00:00:00 2001 From: Javier Viola Date: Tue, 28 Feb 2023 17:43:46 -0300 Subject: [PATCH 4/5] bump to latest version of zombienet --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92ce729a4fbe..d700ff45ce4e 100644 --- a/.gitlab-ci.yml +++ b/.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.3.36" + ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.37" default: cache: {} From b171dd0388d5b89178c49616d16091ce5f691cb8 Mon Sep 17 00:00:00 2001 From: Javier Viola Date: Wed, 1 Mar 2023 09:59:17 -0300 Subject: [PATCH 5/5] add more time to check peers --- .../functional/0001-parachains-pvf.zndsl | 32 +++++++++---------- zombienet_tests/misc/0001-paritydb.zndsl | 20 ++++++------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/zombienet_tests/functional/0001-parachains-pvf.zndsl b/zombienet_tests/functional/0001-parachains-pvf.zndsl index ba7ee8f7d51e..989640de0068 100644 --- a/zombienet_tests/functional/0001-parachains-pvf.zndsl +++ b/zombienet_tests/functional/0001-parachains-pvf.zndsl @@ -23,14 +23,14 @@ one: parachain 2006 is registered within 60 seconds two: parachain 2007 is registered within 60 seconds # Check if network is fully connected. -alice: reports peers count is at least 15 within 20 seconds -bob: reports peers count is at least 15 within 20 seconds -charlie: reports peers count is at least 15 within 20 seconds -dave: reports peers count is at least 15 within 20 seconds -ferdie: reports peers count is at least 15 within 20 seconds -eve: reports peers count is at least 15 within 20 seconds -one: reports peers count is at least 15 within 20 seconds -two: reports peers count is at least 15 within 20 seconds +alice: reports peers count is at least 15 within 30 seconds +bob: reports peers count is at least 15 within 30 seconds +charlie: reports peers count is at least 15 within 30 seconds +dave: reports peers count is at least 15 within 30 seconds +ferdie: reports peers count is at least 15 within 30 seconds +eve: reports peers count is at least 15 within 30 seconds +one: reports peers count is at least 15 within 30 seconds +two: reports peers count is at least 15 within 30 seconds # Ensure parachains made progress. alice: parachain 2000 block height is at least 10 within 300 seconds @@ -54,14 +54,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/zombienet_tests/misc/0001-paritydb.zndsl b/zombienet_tests/misc/0001-paritydb.zndsl index 57d9f68b1c97..99a473e24ff5 100644 --- a/zombienet_tests/misc/0001-paritydb.zndsl +++ b/zombienet_tests/misc/0001-paritydb.zndsl @@ -31,16 +31,16 @@ validator-0: parachain 2008 is registered validator-0: parachain 2009 is registered # Check if network is fully connected. -validator-0: reports peers count is at least 19 within 20 seconds -validator-1: reports peers count is at least 19 within 20 seconds -validator-2: reports peers count is at least 19 within 20 seconds -validator-3: reports peers count is at least 19 within 20 seconds -validator-4: reports peers count is at least 19 within 20 seconds -validator-5: reports peers count is at least 19 within 20 seconds -validator-6: reports peers count is at least 19 within 20 seconds -validator-7: reports peers count is at least 19 within 20 seconds -validator-8: reports peers count is at least 19 within 20 seconds -validator-9: reports peers count is at least 19 within 20 seconds +validator-0: reports peers count is at least 19 within 30 seconds +validator-1: reports peers count is at least 19 within 30 seconds +validator-2: reports peers count is at least 19 within 30 seconds +validator-3: reports peers count is at least 19 within 30 seconds +validator-4: reports peers count is at least 19 within 30 seconds +validator-5: reports peers count is at least 19 within 30 seconds +validator-6: reports peers count is at least 19 within 30 seconds +validator-7: reports peers count is at least 19 within 30 seconds +validator-8: reports peers count is at least 19 within 30 seconds +validator-9: reports peers count is at least 19 within 30 seconds # Ensure parachains made some progress. validator-0: parachain 2000 block height is at least 3 within 30 seconds