From f1cb112cb1bd34e8dfeed1b7c176bd18efa0e1b0 Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Sun, 7 May 2023 16:23:36 -0300
Subject: [PATCH] bump zombienet version. (#7180)

* bump zombienet version

* enable upgrade node test

* changes to fix test

* typo in pipeline
---
 .gitlab-ci.yml                               |  2 +-
 scripts/ci/gitlab/pipeline/zombienet.yml     | 65 ++++++++++----------
 zombienet_tests/misc/0002-upgrade-node.toml  |  4 +-
 zombienet_tests/misc/0002-upgrade-node.zndsl |  4 +-
 4 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a884be7effb0..29c05855b05c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ variables:
   BUILDAH_COMMAND: "buildah --storage-driver overlay2"
   DOCKER_OS: "debian:stretch"
   ARCH: "x86_64"
-  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.49"
+  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.50"
 
 default:
   cache: {}
diff --git a/scripts/ci/gitlab/pipeline/zombienet.yml b/scripts/ci/gitlab/pipeline/zombienet.yml
index cf147ee0eb07..305dfe7f2679 100644
--- a/scripts/ci/gitlab/pipeline/zombienet.yml
+++ b/scripts/ci/gitlab/pipeline/zombienet.yml
@@ -183,40 +183,37 @@ zombienet-tests-misc-paritydb:
   tags:
     - zombienet-polkadot-integration-test
 
-## TODO: https://github.com/paritytech/polkadot/issues/7177
-## This is temporarily because it's currently broken
-##
-# zombienet-tests-misc-upgrade-node:
-#   stage: zombienet
-#   image: "${ZOMBIENET_IMAGE}"
-#   extends:
-#     - .kubernetes-env
-#     - .zombienet-refs
-#   needs:
-#     - job: publish-polkadot-debug-image
-#     - job: publish-test-collators-image
-#     - job: build-linux-stable
-#       artifacts: true
-#   variables:
-#     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}"
-#     - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
-#     - echo "${GH_DIR}"
-#     - export DEBUG=zombie,zombie::network-node
-#     - export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/parity/polkadot:latest"
-#     - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
-#     - BUILD_LINUX_JOB_ID="$(cat ./artifacts/BUILD_LINUX_JOB_ID)"
-#     - export POLKADOT_PR_BIN_URL="https://gitlab.parity.io/parity/mirrors/polkadot/-/jobs/${BUILD_LINUX_JOB_ID}/artifacts/raw/artifacts/polkadot"
-#   script:
-#     - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-#       --github-remote-dir="${GH_DIR}"
-#       --test="0002-upgrade-node.zndsl"
-#   allow_failure: true
-#   retry: 2
-#   tags:
-#     - zombienet-polkadot-integration-test
+zombienet-tests-misc-upgrade-node:
+   stage: zombienet
+   image: "${ZOMBIENET_IMAGE}"
+   extends:
+     - .kubernetes-env
+     - .zombienet-refs
+   needs:
+     - job: publish-polkadot-debug-image
+     - job: publish-test-collators-image
+     - job: build-linux-stable
+       artifacts: true
+   variables:
+     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}"
+     - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
+     - echo "${GH_DIR}"
+     - export DEBUG=zombie,zombie::network-node
+     - export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/parity/polkadot:latest"
+     - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
+     - BUILD_LINUX_JOB_ID="$(cat ./artifacts/BUILD_LINUX_JOB_ID)"
+     - export POLKADOT_PR_BIN_URL="https://gitlab.parity.io/parity/mirrors/polkadot/-/jobs/${BUILD_LINUX_JOB_ID}/artifacts/raw/artifacts/polkadot"
+   script:
+     - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
+       --github-remote-dir="${GH_DIR}"
+       --test="0002-upgrade-node.zndsl"
+   allow_failure: false
+   retry: 2
+   tags:
+     - zombienet-polkadot-integration-test
 
 zombienet-tests-malus-dispute-valid:
   stage: zombienet
diff --git a/zombienet_tests/misc/0002-upgrade-node.toml b/zombienet_tests/misc/0002-upgrade-node.toml
index ef3fa54dc200..b6fff6c8cb83 100644
--- a/zombienet_tests/misc/0002-upgrade-node.toml
+++ b/zombienet_tests/misc/0002-upgrade-node.toml
@@ -9,10 +9,12 @@ chain = "rococo-local"
   [[relaychain.nodes]]
   name = "alice"
   args = [ "-lparachain=debug,runtime=debug", "--db paritydb" ]
+  substrate_cli_args_version = 1
 
   [[relaychain.nodes]]
   name = "bob"
   args = [ "-lparachain=debug,runtime=debug", "--db rocksdb" ]
+  substrate_cli_args_version = 1
 
   [[relaychain.nodes]]
   name = "charlie"
@@ -46,4 +48,4 @@ addToGenesis = true
 [types.Header]
 number = "u64"
 parent_hash = "Hash"
-post_state = "Hash"
\ No newline at end of file
+post_state = "Hash"
diff --git a/zombienet_tests/misc/0002-upgrade-node.zndsl b/zombienet_tests/misc/0002-upgrade-node.zndsl
index 25f87528d627..7b23a2604989 100644
--- a/zombienet_tests/misc/0002-upgrade-node.zndsl
+++ b/zombienet_tests/misc/0002-upgrade-node.zndsl
@@ -2,8 +2,8 @@ Description: Smoke / Upgrade Node
 Network: ./0002-upgrade-node.toml
 Creds: config
 
-alice: parachain 2000 block height is at least 10 within 200 seconds
-bob: parachain 2001 block height is at least 10 within 200 seconds
+charlie: parachain 2000 block height is at least 10 within 200 seconds
+dave: parachain 2001 block height is at least 10 within 200 seconds
 
 # upgrade both nodes
 # For testing using native provider you should set this env var