Skip to content

Commit 5fc7622

Browse files
authored
Bridge zombienet tests - move all test scripts to the same folder (#3333)
Related to #3242
1 parent 150a360 commit 5fc7622

File tree

58 files changed

+97
-229
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+97
-229
lines changed

.config/taplo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# ignore zombienet as they do some deliberate custom toml stuff
44
exclude = [
5+
"bridges/testing/**",
56
"cumulus/zombienet/**",
67
"polkadot/node/malus/integrationtests/**",
78
"polkadot/zombienet_tests/**",

.gitlab/pipeline/build.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -408,8 +408,5 @@ prepare-bridges-zombienet-artifacts:
408408
- .collect-artifacts
409409
before_script:
410410
- mkdir -p ./artifacts/bridges-polkadot-sdk/bridges
411-
- mkdir -p ./artifacts/bridges-polkadot-sdk/cumulus/zombienet
412411
script:
413-
- cp -r bridges/zombienet ./artifacts/bridges-polkadot-sdk/bridges/zombienet
414-
- cp -r cumulus/scripts ./artifacts/bridges-polkadot-sdk/cumulus/scripts
415-
- cp -r cumulus/zombienet/bridge-hubs ./artifacts/bridges-polkadot-sdk/cumulus/zombienet/bridge-hubs
412+
- cp -r bridges/testing ./artifacts/bridges-polkadot-sdk/bridges/testing

.gitlab/pipeline/zombienet/bridges.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
variables:
2929
BRIDGES_ZOMBIENET_TESTS_IMAGE_TAG: ${DOCKER_IMAGES_VERSION}
3030
BRIDGES_ZOMBIENET_TESTS_IMAGE: "docker.io/paritypr/bridges-zombienet-tests"
31-
GH_DIR: "https://github.com/paritytech/polkadot-sdk/tree/${CI_COMMIT_SHA}/bridges/zombienet"
32-
LOCAL_DIR: "/builds/parity/mirrors/polkadot-sdk/bridges/zombienet"
31+
GH_DIR: "https://github.com/paritytech/polkadot-sdk/tree/${CI_COMMIT_SHA}/bridges/testing"
32+
LOCAL_DIR: "/builds/parity/mirrors/polkadot-sdk/bridges/testing"
3333
FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
3434
RUN_IN_CONTAINER: "1"
3535
artifacts:
@@ -51,12 +51,12 @@ zombienet-bridges-0001-asset-transfer-works:
5151
extends:
5252
- .zombienet-bridges-common
5353
script:
54-
- /home/nonroot/bridges-polkadot-sdk/bridges/zombienet/run-new-test.sh 0001-asset-transfer --docker
54+
- /home/nonroot/bridges-polkadot-sdk/bridges/testing/run-new-test.sh 0001-asset-transfer --docker
5555
- echo "Done"
5656

5757
zombienet-bridges-0002-mandatory-headers-synced-while-idle:
5858
extends:
5959
- .zombienet-bridges-common
6060
script:
61-
- /home/nonroot/bridges-polkadot-sdk/bridges/zombienet/run-new-test.sh 0002-mandatory-headers-synced-while-idle --docker
61+
- /home/nonroot/bridges-polkadot-sdk/bridges/testing/run-new-test.sh 0002-mandatory-headers-synced-while-idle --docker
6262
- echo "Done"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# import common functions
4-
source "$(dirname "$0")"/bridges_common.sh
4+
source "${BASH_SOURCE%/*}/../../utils/bridges.sh"
55

66
# Expected sovereign accounts.
77
#
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
$POLKADOT_SDK_PATH/bridges/testing/environments/rococo-westend/bridges_rococo_westend.sh "$@"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Description: User is able to transfer WND from Westend Asset Hub to Rococo Asset Hub and back
2+
Network: ./bridge_hub_rococo_local_network.toml
3+
Creds: config
4+
5+
# ensure that initialization has completed
6+
asset-hub-rococo-collator1: js-script ../../js-helpers/wait-hrmp-channel-opened.js with "1013" within 300 seconds
7+
8+
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Description: User is able to transfer WND from Westend Asset Hub to Rococo Asset Hub and back
2+
Network: ./bridge_hub_rococo_local_network.toml
3+
Creds: config
4+
5+
# relay is already started - let's wait until with-Westend GRANPDA pallet is initialized at Rococo
6+
bridge-hub-rococo-collator1: js-script ../../js-helpers/best-finalized-header-at-bridged-chain.js with "Westend,0" within 400 seconds
7+

0 commit comments

Comments
 (0)