bump zombienet to v1.3.65 (#7631)

* 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
paritytech · Aug 16, 2023 · 91e1279 · 91e1279
1 parent d73503c
commit 91e1279
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -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: {}
@@ -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

diff --git a/parachain/test-parachains/adder/collator/src/main.rs b/parachain/test-parachains/adder/collator/src/main.rs
@@ -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;
 
@@ -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 {

diff --git a/parachain/test-parachains/undying/collator/src/main.rs b/parachain/test-parachains/undying/collator/src/main.rs
@@ -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;
 
@@ -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 {

diff --git a/scripts/ci/gitlab/pipeline/zombienet.yml b/scripts/ci/gitlab/pipeline/zombienet.yml
@@ -12,6 +12,7 @@ zombienet-tests-parachains-smoke-test:
     - job: publish-malus-image
     - job: publish-test-collators-image
   variables:
+    RUN_IN_CONTAINER: "1"
     GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke"
   before_script:
     - echo "Zombie-net Tests Config"
@@ -42,6 +43,7 @@ zombienet-tests-parachains-pvf:
     - job: publish-polkadot-debug-image
     - job: publish-test-collators-image
   variables:
+    RUN_IN_CONTAINER: "1"
     GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
   before_script:
     - echo "Zombie-net Tests Config"
@@ -73,6 +75,7 @@ zombienet-tests-parachains-disputes:
     - job: publish-test-collators-image
     - job: publish-malus-image
   variables:
+    RUN_IN_CONTAINER: "1"
     GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
   before_script:
     - echo "Zombie-net Tests Config"
@@ -104,6 +107,7 @@ zombienet-tests-parachains-disputes-garbage-candidate:
     - job: publish-test-collators-image
     - job: publish-malus-image
   variables:
+    RUN_IN_CONTAINER: "1"
     GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
   before_script:
     - echo "Zombie-net Tests Config"
@@ -135,6 +139,7 @@ zombienet-tests-parachains-disputes-past-session:
     - job: publish-test-collators-image
     - job: publish-malus-image
   variables:
+    RUN_IN_CONTAINER: "1"
     GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
   before_script:
     - echo "Zombie-net Tests Config"
@@ -167,6 +172,7 @@ zombienet-test-parachains-upgrade-smoke-test:
     - job: publish-malus-image
     - job: publish-test-collators-image
   variables:
+    RUN_IN_CONTAINER: "1"
     GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke"
   before_script:
     - echo "ZombieNet Tests Config"
@@ -197,6 +203,7 @@ zombienet-tests-misc-paritydb:
     - job: publish-test-collators-image
       artifacts: true
   variables:
+    RUN_IN_CONTAINER: "1"
     GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/misc"
   before_script:
     - echo "Zombie-net Tests Config"
@@ -227,7 +234,8 @@ zombienet-tests-misc-upgrade-node:
      - job: build-linux-stable
        artifacts: true
    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:
      - echo "Zombie-net Tests Config"
      - echo "${ZOMBIENET_IMAGE_NAME}"
@@ -258,6 +266,7 @@ zombienet-tests-malus-dispute-valid:
     - job: publish-malus-image
     - job: publish-test-collators-image
   variables:
+    RUN_IN_CONTAINER: "1"
     GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/node/malus/integrationtests"
   before_script:
     - echo "Zombie-net Tests Config"
@@ -288,6 +297,7 @@ zombienet-tests-deregister-register-validator:
     - job: publish-polkadot-debug-image
       artifacts: true
   variables:
+    RUN_IN_CONTAINER: "1"
     GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke"
   before_script:
     - echo "Zombie-net Tests Config"
@@ -315,6 +325,7 @@ zombienet-tests-beefy-and-mmr:
   needs:
     - job: publish-polkadot-debug-image
   variables:
+    RUN_IN_CONTAINER: "1"
     GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
   before_script:
     - echo "Zombie-net Tests Config"