From f2eda7c2062a80dfffef59e40d9dbb6e31c0b6b7 Mon Sep 17 00:00:00 2001 From: Javier Viola Date: Wed, 30 Mar 2022 17:57:01 +0200 Subject: [PATCH 1/3] bump zombienet version --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06ececce55cd..22a12ac1c36d 100644 --- a/.gitlab-ci.yml +++ b/.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.24" 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}" From 206c097a30fb93f3aed67f8cdd651ac28b11acf2 Mon Sep 17 00:00:00 2001 From: Javier Viola Date: Wed, 30 Mar 2022 18:33:54 +0200 Subject: [PATCH 2/3] update path for zombienet scripts --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22a12ac1c36d..a1fad1bf8b17 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -655,7 +655,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 @@ -684,7 +684,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 @@ -714,7 +714,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 @@ -744,7 +744,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 From 1c82cf44f32af1058af6f883a7d840c4002399bb Mon Sep 17 00:00:00 2001 From: Javier Viola Date: Thu, 31 Mar 2022 14:39:29 +0200 Subject: [PATCH 3/3] bump version and move from extra_args to args --- .gitlab-ci.yml | 2 +- .../functional/0001-parachains-pvf.toml | 18 +++++++++--------- .../functional/0002-parachains-disputes.toml | 18 +++++++++--------- .../smoke/0001-parachains-smoke-test.toml | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1fad1bf8b17..328059c0fc3e 100644 --- a/.gitlab-ci.yml +++ b/.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.24" + 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}" diff --git a/zombienet_tests/functional/0001-parachains-pvf.toml b/zombienet_tests/functional/0001-parachains-pvf.toml index 631d92f8822c..9ae4d899e690 100644 --- a/zombienet_tests/functional/0001-parachains-pvf.toml +++ b/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/zombienet_tests/functional/0002-parachains-disputes.toml b/zombienet_tests/functional/0002-parachains-disputes.toml index 8e35ee01f696..a92ad71ca958 100644 --- a/zombienet_tests/functional/0002-parachains-disputes.toml +++ b/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/zombienet_tests/smoke/0001-parachains-smoke-test.toml b/zombienet_tests/smoke/0001-parachains-smoke-test.toml index 861876f58bab..4d4324822f43 100644 --- a/zombienet_tests/smoke/0001-parachains-smoke-test.toml +++ b/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