Bridge zombienet tests - move all test scripts to the same folder (#3333)

Related to https://github.com/paritytech/polkadot-sdk/issues/3242

.config/taplo.toml

@@ -2,6 +2,7 @@
 
 # ignore zombienet as they do some deliberate custom toml stuff
 exclude = [
+	"bridges/testing/**",
 	"cumulus/zombienet/**",
 	"polkadot/node/malus/integrationtests/**",
 	"polkadot/zombienet_tests/**",

.gitlab/pipeline/build.yml

@@ -408,8 +408,5 @@ prepare-bridges-zombienet-artifacts:
     - .collect-artifacts
   before_script:
     - mkdir -p ./artifacts/bridges-polkadot-sdk/bridges
-    - mkdir -p ./artifacts/bridges-polkadot-sdk/cumulus/zombienet
   script:
-    - cp -r bridges/zombienet ./artifacts/bridges-polkadot-sdk/bridges/zombienet
-    - cp -r cumulus/scripts ./artifacts/bridges-polkadot-sdk/cumulus/scripts
-    - cp -r cumulus/zombienet/bridge-hubs ./artifacts/bridges-polkadot-sdk/cumulus/zombienet/bridge-hubs
+    - cp -r bridges/testing ./artifacts/bridges-polkadot-sdk/bridges/testing

.gitlab/pipeline/zombienet/bridges.yml

@@ -28,8 +28,8 @@
   variables:
     BRIDGES_ZOMBIENET_TESTS_IMAGE_TAG: ${DOCKER_IMAGES_VERSION}
     BRIDGES_ZOMBIENET_TESTS_IMAGE: "docker.io/paritypr/bridges-zombienet-tests"
-    GH_DIR: "https://github.com/paritytech/polkadot-sdk/tree/${CI_COMMIT_SHA}/bridges/zombienet"
-    LOCAL_DIR: "/builds/parity/mirrors/polkadot-sdk/bridges/zombienet"
+    GH_DIR: "https://github.com/paritytech/polkadot-sdk/tree/${CI_COMMIT_SHA}/bridges/testing"
+    LOCAL_DIR: "/builds/parity/mirrors/polkadot-sdk/bridges/testing"
     FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
     RUN_IN_CONTAINER: "1"
   artifacts:
@@ -51,12 +51,12 @@ zombienet-bridges-0001-asset-transfer-works:
   extends:
     - .zombienet-bridges-common
   script:
-    - /home/nonroot/bridges-polkadot-sdk/bridges/zombienet/run-new-test.sh 0001-asset-transfer --docker
+    - /home/nonroot/bridges-polkadot-sdk/bridges/testing/run-new-test.sh 0001-asset-transfer --docker
     - echo "Done"
 
 zombienet-bridges-0002-mandatory-headers-synced-while-idle:
   extends:
     - .zombienet-bridges-common
   script:
-    - /home/nonroot/bridges-polkadot-sdk/bridges/zombienet/run-new-test.sh 0002-mandatory-headers-synced-while-idle --docker
+    - /home/nonroot/bridges-polkadot-sdk/bridges/testing/run-new-test.sh 0002-mandatory-headers-synced-while-idle --docker
     - echo "Done"

cumulus/scripts/bridges_rococo_westend.sh → bridges/testing/environments/rococo-westend/bridges_rococo_westend.sh

 #!/bin/bash
 
 # import common functions
-source "$(dirname "$0")"/bridges_common.sh
+source "${BASH_SOURCE%/*}/../../utils/bridges.sh"
 
 # Expected sovereign accounts.
 #

bridges/testing/environments/rococo-westend/helper.sh

+#!/bin/bash
+
+$POLKADOT_SDK_PATH/bridges/testing/environments/rococo-westend/bridges_rococo_westend.sh "$@"

bridges/zombienet/environments/rococo-westend/rococo-init.zndsl → bridges/testing/environments/rococo-westend/rococo-init.zndsl

 Description: User is able to transfer WND from Westend Asset Hub to Rococo Asset Hub and back
-Network: ../../../../cumulus/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml
+Network: ./bridge_hub_rococo_local_network.toml
 Creds: config
 
 # ensure that initialization has completed
-asset-hub-rococo-collator1: js-script ../../helpers/wait-hrmp-channel-opened.js with "1013" within 300 seconds
+asset-hub-rococo-collator1: js-script ../../js-helpers/wait-hrmp-channel-opened.js with "1013" within 300 seconds
 
 

bridges/zombienet/environments/rococo-westend/rococo.zndsl → bridges/testing/environments/rococo-westend/rococo.zndsl

 Description: User is able to transfer WND from Westend Asset Hub to Rococo Asset Hub and back
-Network: ../../../../cumulus/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml
+Network: ./bridge_hub_rococo_local_network.toml
 Creds: config
 
 # relay is already started - let's wait until with-Westend GRANPDA pallet is initialized at Rococo
-bridge-hub-rococo-collator1: js-script ../../helpers/best-finalized-header-at-bridged-chain.js with "Westend,0" within 400 seconds
+bridge-hub-rococo-collator1: js-script ../../js-helpers/best-finalized-header-at-bridged-chain.js with "Westend,0" within 400 seconds
 

bridges/zombienet/environments/rococo-westend/spawn.sh → bridges/testing/environments/rococo-westend/spawn.sh

@@ -26,11 +26,11 @@ done
 logs_dir=$TEST_DIR/logs
 helper_script="${BASH_SOURCE%/*}/helper.sh"
 
-rococo_def=$POLKADOT_SDK_PATH/cumulus/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml
+rococo_def=${BASH_SOURCE%/*}/bridge_hub_rococo_local_network.toml
 start_zombienet $TEST_DIR $rococo_def rococo_dir rococo_pid
 echo
 
-westend_def=$POLKADOT_SDK_PATH/cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
+westend_def=${BASH_SOURCE%/*}/bridge_hub_westend_local_network.toml
 start_zombienet $TEST_DIR $westend_def westend_dir westend_pid
 echo
 

bridges/zombienet/environments/rococo-westend/westend-init.zndsl → bridges/testing/environments/rococo-westend/westend-init.zndsl

 Description: User is able to transfer ROC from Rococo Asset Hub to Westend Asset Hub and back
-Network: ../../../../cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
+Network: ./bridge_hub_westend_local_network.toml
 Creds: config
 
 # ensure that initialization has completed
-asset-hub-westend-collator1: js-script ../../helpers/wait-hrmp-channel-opened.js with "1002" within 600 seconds
+asset-hub-westend-collator1: js-script ../../js-helpers/wait-hrmp-channel-opened.js with "1002" within 600 seconds
 

bridges/zombienet/environments/rococo-westend/westend.zndsl → bridges/testing/environments/rococo-westend/westend.zndsl

 Description: User is able to transfer ROC from Rococo Asset Hub to Westend Asset Hub and back
-Network: ../../../../cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
+Network: ./bridge_hub_westend_local_network.toml
 Creds: config
 
 # relay is already started - let's wait until with-Rococo GRANPDA pallet is initialized at Westend
-bridge-hub-westend-collator1: js-script ../../helpers/best-finalized-header-at-bridged-chain.js with "Rococo,0" within 400 seconds
+bridge-hub-westend-collator1: js-script ../../js-helpers/best-finalized-header-at-bridged-chain.js with "Rococo,0" within 400 seconds