pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 17:31:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

bump zombienet to v1.3.65 (#7631)

Browse Source 
* bump zombienet version

* remove workaround, zombienet collators cmd bug fixed in latest version

* add env var to run in ci

* add env var to run in ci
This commit is contained in:
Javier Viola
2023-08-16 17:31:57 -03:00
committed by GitHub
parent a42b32e392
commit e6473e2840
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/.gitlab-ci.yml
+3 -3
View File
@@ -33,12 +33,12 @@ variables:
GIT_STRATEGY: fetch GIT_STRATEGY: fetch
GIT_DEPTH: 100 GIT_DEPTH: 100
CI_SERVER_NAME: "GitLab CI" CI_SERVER_NAME: "GitLab CI"
CI_IMAGE: !reference [.ci-unified, variables, CI_IMAGE] CI_IMAGE: !reference [.ci-unified, variables, CI_IMAGE]
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29" BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29"
BUILDAH_COMMAND: "buildah --storage-driver overlay2" BUILDAH_COMMAND: "buildah --storage-driver overlay2"
DOCKER_OS: "debian:stretch" DOCKER_OS: "debian:stretch"
ARCH: "x86_64" ARCH: "x86_64"
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.55" ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.65"
default: default:
cache: {} cache: {}
@@ -233,7 +233,7 @@ include:
file: /common/timestamp.yml file: /common/timestamp.yml
- project: parity/infrastructure/ci_cd/shared - project: parity/infrastructure/ci_cd/shared
ref: main ref: main
file: /common/ci-unified.yml file: /common/ci-unified.yml
#### stage: .post #### stage: .post
polkadot/parachain/test-parachains/adder/collator/src/main.rs
+1 -5
View File
@@ -21,7 +21,6 @@ use polkadot_node_primitives::CollationGenerationConfig;
use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProtocolMessage}; use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProtocolMessage};
use polkadot_primitives::Id as ParaId; use polkadot_primitives::Id as ParaId;
use sc_cli::{Error as SubstrateCliError, SubstrateCli}; use sc_cli::{Error as SubstrateCliError, SubstrateCli};
use sc_service::Role;
use sp_core::hexdisplay::HexDisplay; use sp_core::hexdisplay::HexDisplay;
use test_parachain_adder_collator::Collator; use test_parachain_adder_collator::Collator;
@@ -54,12 +53,9 @@ fn main() -> Result<()> {
) )
})?; })?;
runner.run_node_until_exit(|mut config| async move { runner.run_node_until_exit(|config| async move {
let collator = Collator::new(); let collator = Collator::new();
// Zombienet is spawning all collators currently with the same CLI, this means it
// sets `--validator` and this is wrong here.
config.role = Role::Full;
let full_node = polkadot_service::build_full( let full_node = polkadot_service::build_full(
config, config,
polkadot_service::NewFullParams { polkadot_service::NewFullParams {
polkadot/parachain/test-parachains/undying/collator/src/main.rs
+1 -5
View File
@@ -21,7 +21,6 @@ use polkadot_node_primitives::CollationGenerationConfig;
use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProtocolMessage}; use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProtocolMessage};
use polkadot_primitives::Id as ParaId; use polkadot_primitives::Id as ParaId;
use sc_cli::{Error as SubstrateCliError, SubstrateCli}; use sc_cli::{Error as SubstrateCliError, SubstrateCli};
use sc_service::Role;
use sp_core::hexdisplay::HexDisplay; use sp_core::hexdisplay::HexDisplay;
use test_parachain_undying_collator::Collator; use test_parachain_undying_collator::Collator;
@@ -54,12 +53,9 @@ fn main() -> Result<()> {
) )
})?; })?;
runner.run_node_until_exit(|mut config| async move { runner.run_node_until_exit(|config| async move {
let collator = Collator::new(cli.run.pov_size, cli.run.pvf_complexity); let collator = Collator::new(cli.run.pov_size, cli.run.pvf_complexity);
// Zombienet is spawning all collators currently with the same CLI, this means it
// sets `--validator` and this is wrong here.
config.role = Role::Full;
let full_node = polkadot_service::build_full( let full_node = polkadot_service::build_full(
config, config,
polkadot_service::NewFullParams { polkadot_service::NewFullParams {
polkadot/scripts/ci/gitlab/pipeline/zombienet.yml
+12 -1
View File
@@ -12,6 +12,7 @@ zombienet-tests-parachains-smoke-test:
- job: publish-malus-image - job: publish-malus-image
- job: publish-test-collators-image - job: publish-test-collators-image
variables: variables:
RUN_IN_CONTAINER: "1"
GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke" GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke"
before_script: before_script:
- echo "Zombie-net Tests Config" - echo "Zombie-net Tests Config"
@@ -42,6 +43,7 @@ zombienet-tests-parachains-pvf:
- job: publish-polkadot-debug-image - job: publish-polkadot-debug-image
- job: publish-test-collators-image - job: publish-test-collators-image
variables: variables:
RUN_IN_CONTAINER: "1"
GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional" GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
before_script: before_script:
- echo "Zombie-net Tests Config" - echo "Zombie-net Tests Config"
@@ -73,6 +75,7 @@ zombienet-tests-parachains-disputes:
- job: publish-test-collators-image - job: publish-test-collators-image
- job: publish-malus-image - job: publish-malus-image
variables: variables:
RUN_IN_CONTAINER: "1"
GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional" GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
before_script: before_script:
- echo "Zombie-net Tests Config" - echo "Zombie-net Tests Config"
@@ -104,6 +107,7 @@ zombienet-tests-parachains-disputes-garbage-candidate:
- job: publish-test-collators-image - job: publish-test-collators-image
- job: publish-malus-image - job: publish-malus-image
variables: variables:
RUN_IN_CONTAINER: "1"
GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional" GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
before_script: before_script:
- echo "Zombie-net Tests Config" - echo "Zombie-net Tests Config"
@@ -135,6 +139,7 @@ zombienet-tests-parachains-disputes-past-session:
- job: publish-test-collators-image - job: publish-test-collators-image
- job: publish-malus-image - job: publish-malus-image
variables: variables:
RUN_IN_CONTAINER: "1"
GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional" GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
before_script: before_script:
- echo "Zombie-net Tests Config" - echo "Zombie-net Tests Config"
@@ -167,6 +172,7 @@ zombienet-test-parachains-upgrade-smoke-test:
- job: publish-malus-image - job: publish-malus-image
- job: publish-test-collators-image - job: publish-test-collators-image
variables: variables:
RUN_IN_CONTAINER: "1"
GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke" GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke"
before_script: before_script:
- echo "ZombieNet Tests Config" - echo "ZombieNet Tests Config"
@@ -197,6 +203,7 @@ zombienet-tests-misc-paritydb:
- job: publish-test-collators-image - job: publish-test-collators-image
artifacts: true artifacts: true
variables: variables:
RUN_IN_CONTAINER: "1"
GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/misc" GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/misc"
before_script: before_script:
- echo "Zombie-net Tests Config" - echo "Zombie-net Tests Config"
@@ -227,7 +234,8 @@ zombienet-tests-misc-upgrade-node:
- job: build-linux-stable - job: build-linux-stable
artifacts: true artifacts: true
variables: variables:
GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/misc" RUN_IN_CONTAINER: "1"
GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/misc"
before_script: before_script:
- echo "Zombie-net Tests Config" - echo "Zombie-net Tests Config"
- echo "${ZOMBIENET_IMAGE_NAME}" - echo "${ZOMBIENET_IMAGE_NAME}"
@@ -258,6 +266,7 @@ zombienet-tests-malus-dispute-valid:
- job: publish-malus-image - job: publish-malus-image
- job: publish-test-collators-image - job: publish-test-collators-image
variables: variables:
RUN_IN_CONTAINER: "1"
GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/node/malus/integrationtests" GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/node/malus/integrationtests"
before_script: before_script:
- echo "Zombie-net Tests Config" - echo "Zombie-net Tests Config"
@@ -288,6 +297,7 @@ zombienet-tests-deregister-register-validator:
- job: publish-polkadot-debug-image - job: publish-polkadot-debug-image
artifacts: true artifacts: true
variables: variables:
RUN_IN_CONTAINER: "1"
GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke" GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke"
before_script: before_script:
- echo "Zombie-net Tests Config" - echo "Zombie-net Tests Config"
@@ -315,6 +325,7 @@ zombienet-tests-beefy-and-mmr:
needs: needs:
- job: publish-polkadot-debug-image - job: publish-polkadot-debug-image
variables: variables:
RUN_IN_CONTAINER: "1"
GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional" GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
before_script: before_script:
- echo "Zombie-net Tests Config" - echo "Zombie-net Tests Config"