From 2af87f04477a3a1546ee04171a1778af509276a7 Mon Sep 17 00:00:00 2001
From: EgorPopelyaev <egor@parity.io>
Date: Tue, 8 Nov 2022 14:59:13 +0100
Subject: [PATCH 1/2] fix failing gitlab ci pipelien

---
 .gitlab-ci.yml                           | 29 ------------------------
 scripts/ci/gitlab/pipeline/zombienet.yml | 10 ++++++++
 2 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 933c0eb196c..e2a58c21c66 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -138,35 +138,6 @@ include:
   # zombienet jobs
   - scripts/ci/gitlab/pipeline/zombienet.yml
 
-0006-rpc_collator_builds_blocks:
-  stage:                           integration-test
-  image:                           "${ZOMBIENET_IMAGE}"
-  <<:                              *zombienet-refs
-  needs:
-    - job:                         build-push-image-test-parachain
-  variables:
-    POLKADOT_IMAGE:                "docker.io/paritypr/polkadot-debug:master"
-    GH_DIR:                        "https://github.com/paritytech/cumulus/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests"
-    COL_IMAGE:                     "docker.io/paritypr/test-parachain:${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
-  before_script:
-    - echo "Zombie-net Tests Config"
-    - echo "${ZOMBIENET_IMAGE}"
-    - echo "${RELAY_IMAGE}"
-    - echo "${COL_IMAGE}"
-    - echo "${GH_DIR}"
-    - export DEBUG=zombie
-    - export RELAY_IMAGE=${POLKADOT_IMAGE}
-    - export COL_IMAGE=${COL_IMAGE}
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-        --github-remote-dir="${GH_DIR}"
-        --concurrency=1
-        --test="0006-rpc_collator_builds_blocks.feature"
-  allow_failure:                   true
-  retry: 2
-  tags:
-    - zombienet-polkadot-integration-test
-
 #### stage:                        .post
 
 # This job cancels the whole pipeline if any of provided jobs fail.
diff --git a/scripts/ci/gitlab/pipeline/zombienet.yml b/scripts/ci/gitlab/pipeline/zombienet.yml
index fcd0a9b669d..4682af16ee4 100644
--- a/scripts/ci/gitlab/pipeline/zombienet.yml
+++ b/scripts/ci/gitlab/pipeline/zombienet.yml
@@ -99,3 +99,13 @@ zombienet-0005-migrate_solo_to_para:
         --concurrency=1
         --test="0005-migrate_solo_to_para.feature"
 
+zombienet-0006-rpc_collator_builds_blocks:
+  extends:
+    - .zombienet-common
+    - .zombienet-refs
+    - .zombienet-before-script
+  script:
+    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
+        --github-remote-dir="${GH_DIR}"
+        --concurrency=1
+        --test="0006-rpc_collator_builds_blocks.feature"

From 582f1cc1b66ab79d4ae290b8ecc2814066c31a48 Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Thu, 20 Oct 2022 11:27:22 -0300
Subject: [PATCH 2/2] bump zombienet version (#1786)

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2a58c21c66..1389fc0802e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,7 @@ variables:
   CI_IMAGE:                        "paritytech/ci-linux:production"
   DOCKER_OS:                       "debian:stretch"
   ARCH:                            "x86_64"
-  ZOMBIENET_IMAGE:                 "docker.io/paritytech/zombienet:v1.2.80"
+  ZOMBIENET_IMAGE:                 "docker.io/paritytech/zombienet:v1.2.82"
 
 .collect-artifacts:
   artifacts: