Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

bump zombienet to v1.3.65 #7631

Merged
merged 4 commits into from
Aug 16, 2023
Merged

bump zombienet to v1.3.65 #7631

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c17d64d
bump zombienet version
pepoviola Aug 16, 2023
333b78f
remove workaround, zombienet collators cmd bug fixed in latest version
pepoviola Aug 16, 2023
688f3c3
add env var to run in ci
pepoviola Aug 16, 2023
35d6ee2
add env var to run in ci
pepoviola Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ variables:
GIT_STRATEGY: fetch
GIT_DEPTH: 100
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_COMMAND: "buildah --storage-driver overlay2"
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.55"
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.65"

default:
cache: {}
Expand Down Expand Up @@ -233,7 +233,7 @@ include:
file: /common/timestamp.yml
- project: parity/infrastructure/ci_cd/shared
ref: main
file: /common/ci-unified.yml
file: /common/ci-unified.yml


#### stage: .post
Expand Down
6 changes: 1 addition & 5 deletions parachain/test-parachains/adder/collator/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ use polkadot_node_primitives::CollationGenerationConfig;
use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProtocolMessage};
use polkadot_primitives::Id as ParaId;
use sc_cli::{Error as SubstrateCliError, SubstrateCli};
use sc_service::Role;
use sp_core::hexdisplay::HexDisplay;
use test_parachain_adder_collator::Collator;

Expand Down Expand Up @@ -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();

// 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(
config,
polkadot_service::NewFullParams {
Expand Down
6 changes: 1 addition & 5 deletions parachain/test-parachains/undying/collator/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ use polkadot_node_primitives::CollationGenerationConfig;
use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProtocolMessage};
use polkadot_primitives::Id as ParaId;
use sc_cli::{Error as SubstrateCliError, SubstrateCli};
use sc_service::Role;
use sp_core::hexdisplay::HexDisplay;
use test_parachain_undying_collator::Collator;

Expand Down Expand Up @@ -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);

// 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(
config,
polkadot_service::NewFullParams {
Expand Down