Merge remote-tracking branch 'origin/master' into oty-check-rust-feat…

…ures

.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.

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"