From 8ba03ac6d23ca99fb0459a54a8a2772cb643bc06 Mon Sep 17 00:00:00 2001
From: Andronik <write@reusable.software>
Date: Tue, 28 Jun 2022 11:15:12 +0200
Subject: [PATCH] zombienet: try to fix parachains upgrade test (#5724)

* zombienet: try to fix parachains upgrade test

* try a different collator image

* Revert "try a different collator image"

This reverts commit c83b2929f5a703be0979b4429ab01808408b074d.

* try setting cumulusBased

* fix zombienet upgrade test

* change image

* update command for test

* update zombienet image

* bump zombienet version

* bump zn version

* Revert "try setting cumulusBased"

This reverts commit 0312fa0a7a19065e097b186a08757938abd7c130.

* Revert "update command for test"

This reverts commit 81707e30188a1838e952d66deedaecbff6cb2971.

* Revert "change image"

This reverts commit 43a4f4a6a0286f5bf6698a44b82de835a723b531.

* zombienet: change validator image to a PR branch

Co-authored-by: Javier Viola <javier@parity.io>
---
 polkadot/.gitlab-ci.yml                                     | 6 +++---
 .../smoke/0002-parachains-upgrade-smoke-test.toml           | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/polkadot/.gitlab-ci.yml b/polkadot/.gitlab-ci.yml
index 67628ced51..5b33eb2c9a 100644
--- a/polkadot/.gitlab-ci.yml
+++ b/polkadot/.gitlab-ci.yml
@@ -728,9 +728,9 @@ zombienet-tests-parachains-disputes:
 
 zombienet-test-parachains-upgrade-smoke-test:
   stage:                           stage3
-  image:                           "${ZOMBIENET_IMAGE}"
   <<:                              *kubernetes-env
   <<:                              *zombienet-refs
+  image:                           "docker.io/paritytech/zombienet:v1.2.45"
   needs:
     - job:                         publish-polkadot-debug-image
     - job:                         publish-malus-image
@@ -739,12 +739,12 @@ zombienet-test-parachains-upgrade-smoke-test:
     GH_DIR:                        'https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke'
   before_script:
     - echo "ZombieNet Tests Config"
-    - echo "docker.io/parity/polkadot:latest"
+    - echo "${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}"
     - echo "docker.io/parity/polkadot-collator:latest"
     - echo "${ZOMBIENET_IMAGE}"
     - echo "${GH_DIR}"
     - export DEBUG=zombie,zombie::network-node
-    - export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/parity/polkadot:latest" # Use polkadot latest image
+    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
     - export COL_IMAGE="docker.io/parity/polkadot-collator:latest" # Use cumulus lastest image
   script:
     - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
diff --git a/polkadot/zombienet_tests/smoke/0002-parachains-upgrade-smoke-test.toml b/polkadot/zombienet_tests/smoke/0002-parachains-upgrade-smoke-test.toml
index d20e2ac4a8..0becb40855 100644
--- a/polkadot/zombienet_tests/smoke/0002-parachains-upgrade-smoke-test.toml
+++ b/polkadot/zombienet_tests/smoke/0002-parachains-upgrade-smoke-test.toml
@@ -26,11 +26,12 @@ command = "polkadot"
 [[parachains]]
 id = 100
 addToGenesis = true
+cumulus_based = true
 
   [parachains.collator]
   name = "collator01"
   image = "{{COL_IMAGE}}"
-  commandWithArgs = "polkadot-collator --collator --alice --force-authoring --tmp --parachain-id 100 --rpc-cors all --unsafe-rpc-external --rpc-methods unsafe --unsafe-ws-external -- --execution wasm --chain /cfg/rococo-local.json --bootnodes /dns/bootnode/tcp/30333/p2p/12D3KooWEyoppNCUx8Yx66oV9fJnriXwCcXwDDUA2kj6vnc6iDEp"
+  command = "polkadot-collator"
 
   [[parachains.collator.env]]
   name = "RUST_LOG"