From cd4f9abf6f145705339d4dd11669274a04b675a7 Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Mon, 4 Apr 2022 09:07:50 -0300
Subject: [PATCH] bump zombienet version (#5225)
* bump zombienet version
* update path for zombienet scripts
* bump version and move from extra_args to args
Co-authored-by: Andrei Sandu <andrei-mihail@parity.io>
---
polkadot/.gitlab-ci.yml | 10 +++++-----
.../functional/0001-parachains-pvf.toml | 18 +++++++++---------
.../functional/0002-parachains-disputes.toml | 18 +++++++++---------
.../smoke/0001-parachains-smoke-test.toml | 4 ++--
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/polkadot/.gitlab-ci.yml b/polkadot/.gitlab-ci.yml
index 8d025dab442..65839108e44 100644
--- a/polkadot/.gitlab-ci.yml
+++ b/polkadot/.gitlab-ci.yml
@@ -32,7 +32,7 @@ variables:
CI_IMAGE: "paritytech/ci-linux:production"
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
- ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.19"
+ ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.25"
VAULT_SERVER_URL: "https://vault.parity-mgmt-vault.parity.io"
VAULT_AUTH_PATH: "gitlab-parity-io-jwt"
VAULT_AUTH_ROLE: "cicd_gitlab_parity_${CI_PROJECT_NAME}"
@@ -660,7 +660,7 @@ zombienet-tests-parachains-smoke-test:
- export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
- export COL_IMAGE="docker.io/paritypr/colander:4519" # The collator image is fixed
script:
- - /home/nonroot/zombie-net/scripts/run-test-env-manager.sh
+ - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
--github-remote-dir="${GH_DIR}"
--test="0001-parachains-smoke-test.feature"
allow_failure: false
@@ -689,7 +689,7 @@ zombienet-tests-parachains-pvf:
- export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
- export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
script:
- - /home/nonroot/zombie-net/scripts/run-test-env-manager.sh
+ - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
--github-remote-dir="${GH_DIR}"
--test="0001-parachains-pvf.feature"
allow_failure: false
@@ -719,7 +719,7 @@ zombienet-tests-parachains-disputes:
- export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
- export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
script:
- - /home/nonroot/zombie-net/scripts/run-test-env-manager.sh
+ - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
--github-remote-dir="${GH_DIR}"
--test="0002-parachains-disputes.feature"
allow_failure: false
@@ -749,7 +749,7 @@ zombienet-tests-malus-dispute-valid:
- export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
- export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
script:
- - /home/nonroot/zombie-net/scripts/run-test-env-manager.sh
+ - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
--github-remote-dir="${GH_DIR}"
--test="0001-dispute-valid-block.feature"
allow_failure: false
diff --git a/polkadot/zombienet_tests/functional/0001-parachains-pvf.toml b/polkadot/zombienet_tests/functional/0001-parachains-pvf.toml
index 631d92f8822..9ae4d899e69 100644
--- a/polkadot/zombienet_tests/functional/0001-parachains-pvf.toml
+++ b/polkadot/zombienet_tests/functional/0001-parachains-pvf.toml
@@ -12,35 +12,35 @@ requests = { memory = "2G", cpu = "1" }
[[relaychain.nodes]]
name = "alice"
- extra_args = [ "--alice", "-lparachain=debug,runtime=debug" ]
+ args = [ "--alice", "-lparachain=debug,runtime=debug" ]
[[relaychain.nodes]]
name = "bob"
- extra_args = [ "--bob", "-lparachain=debug,runtime=debug"]
-
+ args = [ "--bob", "-lparachain=debug,runtime=debug"]
+
[[relaychain.nodes]]
name = "charlie"
- extra_args = [ "--charlie", "-lparachain=debug,runtime=debug" ]
+ args = [ "--charlie", "-lparachain=debug,runtime=debug" ]
[[relaychain.nodes]]
name = "dave"
- extra_args = [ "--dave", "-lparachain=debug,runtime=debug"]
+ args = [ "--dave", "-lparachain=debug,runtime=debug"]
[[relaychain.nodes]]
name = "ferdie"
- extra_args = [ "--ferdie", "-lparachain=debug,runtime=debug" ]
+ args = [ "--ferdie", "-lparachain=debug,runtime=debug" ]
[[relaychain.nodes]]
name = "eve"
- extra_args = [ "--eve", "-lparachain=debug,runtime=debug"]
+ args = [ "--eve", "-lparachain=debug,runtime=debug"]
[[relaychain.nodes]]
name = "one"
- extra_args = [ "--one", "-lparachain=debug,runtime=debug" ]
+ args = [ "--one", "-lparachain=debug,runtime=debug" ]
[[relaychain.nodes]]
name = "two"
- extra_args = [ "--two", "-lparachain=debug,runtime=debug"]
+ args = [ "--two", "-lparachain=debug,runtime=debug"]
[[parachains]]
id = 2000
diff --git a/polkadot/zombienet_tests/functional/0002-parachains-disputes.toml b/polkadot/zombienet_tests/functional/0002-parachains-disputes.toml
index 8e35ee01f69..a92ad71ca95 100644
--- a/polkadot/zombienet_tests/functional/0002-parachains-disputes.toml
+++ b/polkadot/zombienet_tests/functional/0002-parachains-disputes.toml
@@ -19,39 +19,39 @@ requests = { memory = "2G", cpu = "1" }
image = "{{MALUS_IMAGE}}"
name = "alice"
command = "malus dispute-ancestor"
- extra_args = [ "--alice", "-lparachain=debug" ]
+ args = [ "--alice", "-lparachain=debug" ]
[[relaychain.nodes]]
image = "{{MALUS_IMAGE}}"
name = "bob"
command = "malus dispute-ancestor"
- extra_args = [ "--bob", "-lparachain=debug"]
-
+ args = [ "--bob", "-lparachain=debug"]
+
[[relaychain.nodes]]
image = "{{MALUS_IMAGE}}"
name = "charlie"
command = "malus dispute-ancestor"
- extra_args = [ "--charlie", "-lparachain=debug" ]
+ args = [ "--charlie", "-lparachain=debug" ]
[[relaychain.nodes]]
name = "dave"
- extra_args = [ "--dave", "-lparachain=debug"]
+ args = [ "--dave", "-lparachain=debug"]
[[relaychain.nodes]]
name = "ferdie"
- extra_args = [ "--ferdie", "-lparachain=debug" ]
+ args = [ "--ferdie", "-lparachain=debug" ]
[[relaychain.nodes]]
name = "eve"
- extra_args = [ "--eve", "-lparachain=debug"]
+ args = [ "--eve", "-lparachain=debug"]
[[relaychain.nodes]]
name = "one"
- extra_args = [ "--one", "-lparachain=debug" ]
+ args = [ "--one", "-lparachain=debug" ]
[[relaychain.nodes]]
name = "two"
- extra_args = [ "--two", "-lparachain=debug"]
+ args = [ "--two", "-lparachain=debug"]
[[parachains]]
id = 2000
diff --git a/polkadot/zombienet_tests/smoke/0001-parachains-smoke-test.toml b/polkadot/zombienet_tests/smoke/0001-parachains-smoke-test.toml
index 861876f58ba..4d4324822f4 100644
--- a/polkadot/zombienet_tests/smoke/0001-parachains-smoke-test.toml
+++ b/polkadot/zombienet_tests/smoke/0001-parachains-smoke-test.toml
@@ -8,11 +8,11 @@ command = "polkadot"
[[relaychain.nodes]]
name = "alice"
- extra_args = [ "--alice", "-lruntime=debug,parachain=trace" ]
+ args = [ "--alice", "-lruntime=debug,parachain=trace" ]
[[relaychain.nodes]]
name = "bob"
- extra_args = [ "--bob", "-lruntime=debug,parachain=trace" ]
+ args = [ "--bob", "-lruntime=debug,parachain=trace" ]
[[parachains]]
id = 100
--
GitLab