From b65c0a3d0382ee423eebf8104d84cec4277b6a07 Mon Sep 17 00:00:00 2001 From: Alexandru Gheorghe <49718502+alexggh@users.noreply.github.com> Date: Fri, 21 Feb 2025 16:42:39 +0200 Subject: [PATCH] remove redundant 0016-approval-voting-parallel test (#7659) The test was flaky and was disabled here https://github.com/paritytech/polkadot-sdk/issues/6345, looked at the flakiness https://github.com/paritytech/polkadot-sdk/issues/6345#issuecomment-2674063608 and it wasn't because of some bug in our production code, but because of the way the test interacts with the infrastructure. Since https://github.com/paritytech/polkadot-sdk/pull/7504 this test is now testing redundant things that other tests like 0009-approval-voting-coalescing.toml and 0006-parachains-max-tranche0 already cover, so instead of investing trying to fix it, just remove it. Fixes: https://github.com/paritytech/polkadot-sdk/issues/6345 Signed-off-by: Alexandru Gheorghe --- .gitlab/pipeline/zombienet/polkadot.yml | 8 -- .../0016-approval-voting-parallel.toml | 120 ------------------ .../0016-approval-voting-parallel.zndsl | 35 ----- 3 files changed, 163 deletions(-) delete mode 100644 polkadot/zombienet_tests/functional/0016-approval-voting-parallel.toml delete mode 100644 polkadot/zombienet_tests/functional/0016-approval-voting-parallel.zndsl diff --git a/.gitlab/pipeline/zombienet/polkadot.yml b/.gitlab/pipeline/zombienet/polkadot.yml index 1721a9b9c3333..cfb0f93ef38cb 100644 --- a/.gitlab/pipeline/zombienet/polkadot.yml +++ b/.gitlab/pipeline/zombienet/polkadot.yml @@ -187,14 +187,6 @@ zombienet-polkadot-functional-0015-coretime-shared-core: --local-dir="${LOCAL_DIR}/functional" --test="0015-coretime-shared-core.zndsl" -.zombienet-polkadot-functional-0016-approval-voting-parallel: - extends: - - .zombienet-polkadot-common - script: - - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh - --local-dir="${LOCAL_DIR}/functional" - --test="0016-approval-voting-parallel.zndsl" - zombienet-polkadot-functional-0018-shared-core-idle-parachain: extends: - .zombienet-polkadot-common diff --git a/polkadot/zombienet_tests/functional/0016-approval-voting-parallel.toml b/polkadot/zombienet_tests/functional/0016-approval-voting-parallel.toml deleted file mode 100644 index c035e23639c14..0000000000000 --- a/polkadot/zombienet_tests/functional/0016-approval-voting-parallel.toml +++ /dev/null @@ -1,120 +0,0 @@ -[settings] -timeout = 1000 - -[relaychain] -default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}" -chain = "rococo-local" - -[relaychain.genesis.runtimeGenesis.patch.configuration.config] - needed_approvals = 4 - relay_vrf_modulo_samples = 2 - -[relaychain.genesis.runtimeGenesis.patch.configuration.config.approval_voting_params] - max_approval_coalesce_count = 5 - -[relaychain.default_resources] -limits = { memory = "4G", cpu = "2" } -requests = { memory = "2G", cpu = "1" } - - [[relaychain.node_groups]] - name = "alice" - args = ["-lparachain=debug,runtime=debug", "--enable-approval-voting-parallel"] - count = 8 - - [[relaychain.node_groups]] - name = "bob" - args = ["-lparachain=debug,runtime=debug"] - count = 7 - -[[parachains]] -id = 2000 -addToGenesis = true -genesis_state_generator = "undying-collator export-genesis-state --pov-size=100000 --pvf-complexity=1" - - [parachains.collator] - name = "collator01" - image = "{{COL_IMAGE}}" - command = "undying-collator" - args = ["-lparachain=debug", "--pov-size=100000", "--pvf-complexity=1", "--parachain-id=2000"] - -[[parachains]] -id = 2001 -addToGenesis = true -genesis_state_generator = "undying-collator export-genesis-state --pov-size=100000 --pvf-complexity=10" - - [parachains.collator] - name = "collator02" - image = "{{COL_IMAGE}}" - command = "undying-collator" - args = ["-lparachain=debug", "--pov-size=100000", "--parachain-id=2001", "--pvf-complexity=10"] - -[[parachains]] -id = 2002 -addToGenesis = true -genesis_state_generator = "undying-collator export-genesis-state --pov-size=100000 --pvf-complexity=100" - - [parachains.collator] - name = "collator03" - image = "{{COL_IMAGE}}" - command = "undying-collator" - args = ["-lparachain=debug", "--pov-size=100000", "--parachain-id=2002", "--pvf-complexity=100"] - -[[parachains]] -id = 2003 -addToGenesis = true -genesis_state_generator = "undying-collator export-genesis-state --pov-size=20000 --pvf-complexity=300" - - [parachains.collator] - name = "collator04" - image = "{{COL_IMAGE}}" - command = "undying-collator" - args = ["-lparachain=debug", "--pov-size=20000", "--parachain-id=2003", "--pvf-complexity=300"] - -[[parachains]] -id = 2004 -addToGenesis = true -genesis_state_generator = "undying-collator export-genesis-state --pov-size=100000 --pvf-complexity=300" - - [parachains.collator] - name = "collator05" - image = "{{COL_IMAGE}}" - command = "undying-collator" - args = ["-lparachain=debug", "--pov-size=100000", "--parachain-id=2004", "--pvf-complexity=300"] - -[[parachains]] -id = 2005 -addToGenesis = true -genesis_state_generator = "undying-collator export-genesis-state --pov-size=20000 --pvf-complexity=400" - - [parachains.collator] - name = "collator06" - image = "{{COL_IMAGE}}" - command = "undying-collator" - args = ["-lparachain=debug", "--pov-size=20000", "--pvf-complexity=400", "--parachain-id=2005"] - -[[parachains]] -id = 2006 -addToGenesis = true -genesis_state_generator = "undying-collator export-genesis-state --pov-size=100000 --pvf-complexity=300" - - [parachains.collator] - name = "collator07" - image = "{{COL_IMAGE}}" - command = "undying-collator" - args = ["-lparachain=debug", "--pov-size=100000", "--pvf-complexity=300", "--parachain-id=2006"] - -[[parachains]] -id = 2007 -addToGenesis = true -genesis_state_generator = "undying-collator export-genesis-state --pov-size=100000 --pvf-complexity=300" - - [parachains.collator] - name = "collator08" - image = "{{COL_IMAGE}}" - command = "undying-collator" - args = ["-lparachain=debug", "--pov-size=100000", "--pvf-complexity=300", "--parachain-id=2007"] - -[types.Header] -number = "u64" -parent_hash = "Hash" -post_state = "Hash" \ No newline at end of file diff --git a/polkadot/zombienet_tests/functional/0016-approval-voting-parallel.zndsl b/polkadot/zombienet_tests/functional/0016-approval-voting-parallel.zndsl deleted file mode 100644 index d707077474741..0000000000000 --- a/polkadot/zombienet_tests/functional/0016-approval-voting-parallel.zndsl +++ /dev/null @@ -1,35 +0,0 @@ -Description: Check finality works with approval voting parallel enabled -Network: ./0016-approval-voting-parallel.toml -Creds: config - -# Check authority status. -alice: reports node_roles is 4 - -# Ensure parachains are registered. -alice: parachain 2000 is registered within 60 seconds -alice: parachain 2001 is registered within 60 seconds -alice: parachain 2002 is registered within 60 seconds -alice: parachain 2003 is registered within 60 seconds -alice: parachain 2004 is registered within 60 seconds -alice: parachain 2005 is registered within 60 seconds -alice: parachain 2006 is registered within 60 seconds -alice: parachain 2007 is registered within 60 seconds - -# Ensure parachains made progress. -alice: parachain 2000 block height is at least 10 within 300 seconds -alice: parachain 2001 block height is at least 10 within 300 seconds -alice: parachain 2002 block height is at least 10 within 300 seconds -alice: parachain 2003 block height is at least 10 within 300 seconds -alice: parachain 2004 block height is at least 10 within 300 seconds -alice: parachain 2005 block height is at least 10 within 300 seconds -alice: parachain 2006 block height is at least 10 within 300 seconds -alice: parachain 2007 block height is at least 10 within 300 seconds - -alice: reports substrate_block_height{status="finalized"} is at least 30 within 180 seconds -bob: reports substrate_block_height{status="finalized"} is at least 30 within 180 seconds - -alice: reports polkadot_parachain_approval_checking_finality_lag < 3 -bob: reports polkadot_parachain_approval_checking_finality_lag < 3 - -alice: reports polkadot_parachain_approvals_no_shows_total < 3 within 10 seconds -bob: reports polkadot_parachain_approvals_no_shows_total < 3 within 10 seconds