From 19855206c2575e0ee237a2656b484f4b03e099f9 Mon Sep 17 00:00:00 2001 From: DenzelPenzel Date: Tue, 11 Nov 2025 20:48:53 +0000 Subject: [PATCH 1/2] chore: update zombienet environment vars --- .github/workflows/zombienet-reusable-preflight.yml | 4 ++++ .github/zombienet-env | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/zombienet-reusable-preflight.yml b/.github/workflows/zombienet-reusable-preflight.yml index e499bcf30cb48..0d9bb7b8a60d7 100644 --- a/.github/workflows/zombienet-reusable-preflight.yml +++ b/.github/workflows/zombienet-reusable-preflight.yml @@ -328,7 +328,11 @@ jobs: echo "Modified: ${{ steps.set_changes.outputs.modified_keys }}" echo "CI_IMAGE: ${{ steps.set_vars.outputs.IMAGE }}" echo "ZOMBIENET_IMAGE: ${{ steps.set_vars.outputs.ZOMBIENET_IMAGE }}" + echo "ZOMBIENET_DEFAULT_RUNNER: ${{ steps.set_vars.outputs.ZOMBIENET_DEFAULT_RUNNER }}" + echo "ZOMBIENET_LARGE_RUNNER: ${{ steps.set_vars.outputs.ZOMBIENET_LARGE_RUNNER }}" echo "ZOMBIENET_SDK_IMAGE: ${{ steps.set_vars.outputs.ZOMBIENET_SDK_IMAGE }}" + echo "ZOMBIENET_SDK_DEFAULT_RUNNER: ${{ steps.set_vars.outputs.ZOMBIENET_SDK_DEFAULT_RUNNER }}" + echo "ZOMBIENET_SDK_LARGE_RUNNER: ${{ steps.set_vars.outputs.ZOMBIENET_SDK_LARGE_RUNNER }}" - name: Generate test matrix id: generate_test_matrix diff --git a/.github/zombienet-env b/.github/zombienet-env index ef24cc6c44af8..d8c6938665b12 100644 --- a/.github/zombienet-env +++ b/.github/zombienet-env @@ -2,9 +2,9 @@ ZOMBIENET_PROVIDER=native ZOMBIENET_IMAGE_FOR_NATIVE=docker.io/paritytech/zombienet:v1.3.133 ZOMBIENET_DEFAULT_RUNNER_FOR_NATIVE=parity-zombienet-native-default -ZOMBIENET_LARGE_RUNNER_FOR_NATIVE=parity-zombienet-native-large +ZOMBIENET_LARGE_RUNNER_FOR_NATIVE=parity-zombienet-native-default ZOMBIENET_DEFAULT_RUNNER_FOR_NATIVE_PERSISTENT=parity-zombienet-native-default-persistent -ZOMBIENET_LARGE_RUNNER_FOR_NATIVE_PERSISTENT=parity-zombienet-native-large-persistent +ZOMBIENET_LARGE_RUNNER_FOR_NATIVE_PERSISTENT=parity-zombienet-native-default-persistent ZOMBIENET_IMAGE_FOR_K8S=docker.io/paritytech/zombienet:v1.3.133 ZOMBIENET_RUNNER_FOR_K8S=parity-zombienet DEBUG=zombie,zombie::network-node,zombie::kube::client::logs @@ -13,9 +13,9 @@ DEBUG=zombie,zombie::network-node,zombie::kube::client::logs ZOMBIE_PROVIDER=native ZOMBIENET_SDK_IMAGE_FOR_NATIVE=docker.io/paritytech/ci-unified:bullseye-1.84.1-2025-01-28-v202502131220 ZOMBIENET_SDK_DEFAULT_RUNNER_FOR_NATIVE=parity-zombienet-native-default -ZOMBIENET_SDK_LARGE_RUNNER_FOR_NATIVE=parity-zombienet-native-large +ZOMBIENET_SDK_LARGE_RUNNER_FOR_NATIVE=parity-zombienet-native-default ZOMBIENET_SDK_DEFAULT_RUNNER_FOR_NATIVE_PERSISTENT=parity-zombienet-native-default-persistent -ZOMBIENET_SDK_LARGE_RUNNER_FOR_NATIVE_PERSISTENT=parity-zombienet-native-large-persistent +ZOMBIENET_SDK_LARGE_RUNNER_FOR_NATIVE_PERSISTENT=parity-zombienet-native-default-persistent ZOMBIENET_SDK_IMAGE_FOR_K8S=docker.io/paritytech/zombienet:v1.3.133 ZOMBIENET_SDK_RUNNER_FOR_K8S=parity-zombienet RUST_LOG=info,zombienet_orchestrator=trace,cumulus_zombienet_sdk_helpers=debug From b1b1a545c3f8c23f5df6fa2858b5e06ba051afd3 Mon Sep 17 00:00:00 2001 From: DenzelPenzel Date: Wed, 12 Nov 2025 11:13:37 +0000 Subject: [PATCH 2/2] chore: remove large runner variables from zombienet environment and workflows --- .../zombienet-reusable-preflight.yml | 4 -- .github/zombienet-env | 8 +-- .../zombienet_cumulus_tests.yml | 22 ++++---- .../zombienet_polkadot_tests.yml | 52 +++++++++---------- 4 files changed, 41 insertions(+), 45 deletions(-) diff --git a/.github/workflows/zombienet-reusable-preflight.yml b/.github/workflows/zombienet-reusable-preflight.yml index 0d9bb7b8a60d7..e499bcf30cb48 100644 --- a/.github/workflows/zombienet-reusable-preflight.yml +++ b/.github/workflows/zombienet-reusable-preflight.yml @@ -328,11 +328,7 @@ jobs: echo "Modified: ${{ steps.set_changes.outputs.modified_keys }}" echo "CI_IMAGE: ${{ steps.set_vars.outputs.IMAGE }}" echo "ZOMBIENET_IMAGE: ${{ steps.set_vars.outputs.ZOMBIENET_IMAGE }}" - echo "ZOMBIENET_DEFAULT_RUNNER: ${{ steps.set_vars.outputs.ZOMBIENET_DEFAULT_RUNNER }}" - echo "ZOMBIENET_LARGE_RUNNER: ${{ steps.set_vars.outputs.ZOMBIENET_LARGE_RUNNER }}" echo "ZOMBIENET_SDK_IMAGE: ${{ steps.set_vars.outputs.ZOMBIENET_SDK_IMAGE }}" - echo "ZOMBIENET_SDK_DEFAULT_RUNNER: ${{ steps.set_vars.outputs.ZOMBIENET_SDK_DEFAULT_RUNNER }}" - echo "ZOMBIENET_SDK_LARGE_RUNNER: ${{ steps.set_vars.outputs.ZOMBIENET_SDK_LARGE_RUNNER }}" - name: Generate test matrix id: generate_test_matrix diff --git a/.github/zombienet-env b/.github/zombienet-env index d8c6938665b12..ef24cc6c44af8 100644 --- a/.github/zombienet-env +++ b/.github/zombienet-env @@ -2,9 +2,9 @@ ZOMBIENET_PROVIDER=native ZOMBIENET_IMAGE_FOR_NATIVE=docker.io/paritytech/zombienet:v1.3.133 ZOMBIENET_DEFAULT_RUNNER_FOR_NATIVE=parity-zombienet-native-default -ZOMBIENET_LARGE_RUNNER_FOR_NATIVE=parity-zombienet-native-default +ZOMBIENET_LARGE_RUNNER_FOR_NATIVE=parity-zombienet-native-large ZOMBIENET_DEFAULT_RUNNER_FOR_NATIVE_PERSISTENT=parity-zombienet-native-default-persistent -ZOMBIENET_LARGE_RUNNER_FOR_NATIVE_PERSISTENT=parity-zombienet-native-default-persistent +ZOMBIENET_LARGE_RUNNER_FOR_NATIVE_PERSISTENT=parity-zombienet-native-large-persistent ZOMBIENET_IMAGE_FOR_K8S=docker.io/paritytech/zombienet:v1.3.133 ZOMBIENET_RUNNER_FOR_K8S=parity-zombienet DEBUG=zombie,zombie::network-node,zombie::kube::client::logs @@ -13,9 +13,9 @@ DEBUG=zombie,zombie::network-node,zombie::kube::client::logs ZOMBIE_PROVIDER=native ZOMBIENET_SDK_IMAGE_FOR_NATIVE=docker.io/paritytech/ci-unified:bullseye-1.84.1-2025-01-28-v202502131220 ZOMBIENET_SDK_DEFAULT_RUNNER_FOR_NATIVE=parity-zombienet-native-default -ZOMBIENET_SDK_LARGE_RUNNER_FOR_NATIVE=parity-zombienet-native-default +ZOMBIENET_SDK_LARGE_RUNNER_FOR_NATIVE=parity-zombienet-native-large ZOMBIENET_SDK_DEFAULT_RUNNER_FOR_NATIVE_PERSISTENT=parity-zombienet-native-default-persistent -ZOMBIENET_SDK_LARGE_RUNNER_FOR_NATIVE_PERSISTENT=parity-zombienet-native-default-persistent +ZOMBIENET_SDK_LARGE_RUNNER_FOR_NATIVE_PERSISTENT=parity-zombienet-native-large-persistent ZOMBIENET_SDK_IMAGE_FOR_K8S=docker.io/paritytech/zombienet:v1.3.133 ZOMBIENET_SDK_RUNNER_FOR_K8S=parity-zombienet RUST_LOG=info,zombienet_orchestrator=trace,cumulus_zombienet_sdk_helpers=debug diff --git a/.github/zombienet-tests/zombienet_cumulus_tests.yml b/.github/zombienet-tests/zombienet_cumulus_tests.yml index 3760e284359c9..2de3c3160799d 100644 --- a/.github/zombienet-tests/zombienet_cumulus_tests.yml +++ b/.github/zombienet-tests/zombienet_cumulus_tests.yml @@ -1,18 +1,18 @@ - job-name: "zombienet-cumulus-0001-sync_blocks_from_tip_without_connected_collator" test-filter: "zombie_ci::sync_blocks::sync_blocks_from_tip_without_connected_collator" - runner-type: "large" + runner-type: "default" cumulus-image: "test-parachain" use-zombienet-sdk: true - job-name: "zombienet-cumulus-0002-pov_recovery" test-filter: "zombie_ci::pov_recovery::pov_recovery" - runner-type: "large" + runner-type: "default" cumulus-image: "test-parachain" use-zombienet-sdk: true - job-name: "zombienet-cumulus-0003-full_node_catching_up" test-filter: "zombie_ci::full_node_catching_up::full_node_catching_up" - runner-type: "large" + runner-type: "default" cumulus-image: "test-parachain" - job-name: "zombienet-cumulus-0004-runtime_upgrade" @@ -30,19 +30,19 @@ - job-name: "zombienet-cumulus-0006-rpc_collator_builds_blocks" test-filter: "zombie_ci::rpc_collator_build_blocks::rpc_collator_builds_blocks" - runner-type: "large" + runner-type: "default" cumulus-image: "test-parachain" use-zombienet-sdk: true - job-name: "zombienet-cumulus-0007-full_node_warp_sync" test-filter: "zombie_ci::full_node_warp_sync::full_node_warp_sync" - runner-type: "large" + runner-type: "default" cumulus-image: "test-parachain" use-zombienet-sdk: true - job-name: "zombienet-cumulus-0008-elastic_authoring" test-filter: "zombie_ci::elastic_scaling::slot_based_authoring::elastic_scaling_slot_based_authoring" - runner-type: "large" + runner-type: "default" cumulus-image: "test-parachain" use-zombienet-sdk: true @@ -50,7 +50,7 @@ # See https://github.com/paritytech/polkadot-sdk/issues/8986 - job-name: "zombienet-cumulus-0009-elastic_scaling_pov_recovery" test-filter: "zombie_ci::elastic_scaling::pov_recovery::elastic_scaling_pov_recovery" - runner-type: "large" + runner-type: "default" cumulus-image: "test-parachain" use-zombienet-sdk: true @@ -58,13 +58,13 @@ # See https://github.com/paritytech/polkadot-sdk/issues/8999 - job-name: "zombienet-cumulus-0010-elastic_scaling_multiple_block_per_slot" test-filter: "zombie_ci::elastic_scaling::multiple_blocks_per_slot::elastic_scaling_multiple_blocks_per_slot" - runner-type: "large" + runner-type: "default" cumulus-image: "test-parachain" use-zombienet-sdk: true - job-name: "zombienet-cumulus-0011-dht-bootnodes" test-filter: "zombie_ci::bootnodes::dht_bootnodes_test" - runner-type: "large" + runner-type: "default" cumulus-image: "polkadot-parachain-debug" use-zombienet-sdk: true @@ -76,13 +76,13 @@ - job-name: "zombienet-cumulus-0013-elastic_scaling_slot_based_rp_offset" test-filter: "zombie_ci::elastic_scaling::slot_based_rp_offset::elastic_scaling_slot_based_relay_parent_offset_test" - runner-type: "large" + runner-type: "default" cumulus-image: "test-parachain" use-zombienet-sdk: true - job-name: "zombienet-cumulus-0014-elastic_scaling_upgrade_to_3_cores" test-filter: "zombie_ci::elastic_scaling::upgrade_to_3_cores::elastic_scaling_upgrade_to_3_cores" - runner-type: "large" + runner-type: "default" cumulus-image: "test-parachain" use-zombienet-sdk: true needs-wasm-binary: true diff --git a/.github/zombienet-tests/zombienet_polkadot_tests.yml b/.github/zombienet-tests/zombienet_polkadot_tests.yml index bfae60cc46a71..3e3fd238b068f 100644 --- a/.github/zombienet-tests/zombienet_polkadot_tests.yml +++ b/.github/zombienet-tests/zombienet_polkadot_tests.yml @@ -2,14 +2,14 @@ - job-name: "zombienet-polkadot-functional-0001-parachains-pvf" test-definition: "0001-parachains-pvf.zndsl" local-dir: "./polkadot/zombienet_tests/functional" - runner-type: "large" + runner-type: "default" concurrency: 1 use-zombienet-sdk: false - job-name: "zombienet-polkadot-functional-0002-parachains-disputes" test-definition: "0002-parachains-disputes.zndsl" local-dir: "./polkadot/zombienet_tests/functional" - runner-type: "large" + runner-type: "default" concurrency: 1 use-zombienet-sdk: false @@ -22,31 +22,31 @@ - job-name: "zombienet-polkadot-functional-0004-parachains-disputes-garbage-candidate" test-definition: "0004-parachains-garbage-candidate.zndsl" local-dir: "./polkadot/zombienet_tests/functional" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: false - job-name: "zombienet-polkadot-functional-0006-parachains-max-tranche0" test-definition: "0006-parachains-max-tranche0.zndsl" local-dir: "./polkadot/zombienet_tests/functional" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: false - job-name: "zombienet-polkadot-functional-0007-dispute-freshly-finalized" test-definition: "0007-dispute-freshly-finalized.zndsl" local-dir: "./polkadot/zombienet_tests/functional" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: false - job-name: "zombienet-polkadot-functional-0013-systematic-chunk-recovery" test-definition: "0013-systematic-chunk-recovery.zndsl" local-dir: "./polkadot/zombienet_tests/functional" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: false - job-name: "zombienet-polkadot-functional-0014-chunk-fetching-network-compatibility" test-definition: "0014-chunk-fetching-network-compatibility.zndsl" local-dir: "./polkadot/zombienet_tests/functional" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: false additional-setup: | BIN_DIR="$(pwd)/bin_old" @@ -73,7 +73,7 @@ - job-name: "zombienet-polkadot-functional-0015-coretime-shared-core" test-definition: "0015-coretime-shared-core.zndsl" local-dir: "./polkadot/zombienet_tests/functional" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: false additional-setup: | cp --remove-destination ./polkadot/zombienet_tests/assign-core.js ./polkadot/zombienet_tests/functional @@ -81,7 +81,7 @@ - job-name: "zombienet-polkadot-functional-0019-coretime-collation-fetching-fairness" test-definition: "0019-coretime-collation-fetching-fairness.zndsl" local-dir: "./polkadot/zombienet_tests/functional" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: false additional-setup: | cp --remove-destination ./polkadot/zombienet_tests/assign-core.js ./polkadot/zombienet_tests/functional @@ -109,13 +109,13 @@ - job-name: "zombienet-polkadot-smoke-0004-coretime-smoke-test" test-definition: "0004-coretime-smoke-test.zndsl" local-dir: "./polkadot/zombienet_tests/smoke" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: false - job-name: "zombienet-polkadot-smoke-0005-precompile-pvf-smoke" test-definition: "0005-precompile-pvf-smoke.zndsl" local-dir: "./polkadot/zombienet_tests/smoke" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: false # Misc tests using traditional zombienet @@ -123,7 +123,7 @@ - job-name: "zombienet-polkadot-misc-0001-parachains-paritydb" test-definition: "0001-paritydb.zndsl" local-dir: "./polkadot/zombienet_tests/misc" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: false # TODO: needs to resolve how to pass the GH_TOKEN to pods @@ -140,7 +140,7 @@ - job-name: "zombienet-polkadot-malus-0001-dispute-valid" test-definition: "0001-dispute-valid-block.zndsl" local-dir: "./polkadot/node/malus/integrationtests" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: false # SDK tests using zombienet-sdk @@ -153,43 +153,43 @@ - job-name: "zombienet-polkadot-elastic-scaling-slot-based-3cores" test-filter: "elastic_scaling::slot_based_3cores::slot_based_3cores_test" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: true cumulus-image: "test-parachain" # TODO: Disabled, fails very often with zombienet native provider - job-name: "zombienet-polkadot-elastic-scaling-slot-based-12cores" test-filter: "elastic_scaling::slot_based_12cores::slot_based_12cores_test" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: true cumulus-image: "test-parachain" - job-name: "zombienet-polkadot-elastic-scaling-doesnt-break-parachains" test-filter: "elastic_scaling::doesnt_break_parachains::doesnt_break_parachains_test" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: true - job-name: "zombienet-polkadot-elastic-scaling-basic-3cores" test-filter: "elastic_scaling::basic_3cores::basic_3cores_test" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: true cumulus-image: "colander" - job-name: "zombienet-polkadot-functional-sync-backing" test-filter: "functional::sync_backing::sync_backing_test" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: true cumulus-image: "test-parachain" - job-name: "zombienet-polkadot-functional-async-backing-6-seconds-rate" test-filter: "functional::async_backing_6_seconds_rate::async_backing_6_seconds_rate_test" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: true # TODO: Disabled, occasionally (1 on ~50-100 runs) fails - job-name: "zombienet-polkadot-functional-duplicate-collations" test-filter: "functional::duplicate_collations::duplicate_collations_test" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: true # TODO: Disabled, occasionally (2 on ~50-70 runs) fails @@ -201,19 +201,19 @@ # TODO: Disabled, occasionally (1 on ~50-100 runs) fails - job-name: "zombienet-polkadot-functional-spam-statement-distribution-requests" test-filter: "functional::spam_statement_distribution_requests::spam_statement_distribution_requests_test" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: true cumulus-image: "colander" - job-name: "zombienet-polkadot-approval-voting-coalescing" test-filter: "functional::approval_voting_coalescing::approval_voting_coalescing_test" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: true cumulus-image: "colander" - job-name: "zombienet-polkadot-approved-peer-mixed-validators" test-filter: "functional::approved_peer_mixed_validators::approved_peer_mixed_validators_test" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: true cumulus-image: "colander" additional-setup: | @@ -240,15 +240,15 @@ - job-name: "zombienet-polkadot-functional-validator-disabling" test-filter: "functional::validator_disabling::validator_disabling_test" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: true - job-name: "zombienet-polkadot-dispute-old-finalized" test-filter: "functional::dispute_old_finalized::dispute_old_finalized" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: true - job-name: "zombienet-polkadot-shared-core-idle-parachain" test-filter: "functional::shared_core_idle_parachain::shared_core_idle_parachain_test" - runner-type: "large" + runner-type: "default" use-zombienet-sdk: true