Skip to content

Commit 88f4306

Browse files
serban300mordamax
authored andcommitted
Fix zombienet-bridges-0001-asset-transfer-works (paritytech#6175)
Closes paritytech#6161 Westend BridgeHub freezes for a while at block 3 and if we try to init the bridge and fund the accounts during that time, it fails. So we wait untill all the parachains produced at least 10 blocks, in order to make sure that they work reliably.
1 parent 74bb59a commit 88f4306

7 files changed

Lines changed: 22 additions & 7 deletions

File tree

.gitlab/pipeline/zombienet/bridges.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
- if: $CI_COMMIT_REF_NAME =~ /^gh-readonly-queue.*$/
1212
variables:
1313
DOCKER_IMAGES_VERSION: ${CI_COMMIT_SHORT_SHA}
14-
- !reference [.build-refs, rules]
14+
- !reference [ .build-refs, rules ]
1515
before_script:
1616
- echo "Zombienet Tests Config"
1717
- echo "${ZOMBIENET_IMAGE}"
@@ -47,8 +47,6 @@
4747
- cp -r /tmp/bridges-tests-run-*/bridge_hub_rococo_local_network/*.log ./zombienet-logs/
4848
# copy logs of westend nodes
4949
- cp -r /tmp/bridges-tests-run-*/bridge_hub_westend_local_network/*.log ./zombienet-logs/
50-
tags:
51-
- zombienet-polkadot-integration-test
5250

5351
zombienet-bridges-0001-asset-transfer-works:
5452
extends:

bridges/testing/environments/rococo-westend/rococo.zndsl renamed to bridges/testing/environments/rococo-westend/rococo-bridge.zndsl

File renamed without changes.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Description: Check if the Rococo parachains started producing blocks reliably
2+
Network: ./bridge_hub_westend_local_network.toml
3+
Creds: config
4+
5+
# ensure that initialization has completed
6+
asset-hub-rococo-collator1: reports block height is at least 10 within 180 seconds
7+
bridge-hub-rococo-collator1: reports block height is at least 10 within 180 seconds
8+

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@ start_zombienet $TEST_DIR $westend_def westend_dir westend_pid
3535
echo
3636

3737
if [[ $init -eq 1 ]]; then
38+
run_zndsl ${BASH_SOURCE%/*}/rococo-start.zndsl $rococo_dir
39+
run_zndsl ${BASH_SOURCE%/*}/westend-start.zndsl $westend_dir
40+
3841
rococo_init_log=$logs_dir/rococo-init.log
3942
echo -e "Setting up the rococo side of the bridge. Logs available at: $rococo_init_log\n"
40-
4143
westend_init_log=$logs_dir/westend-init.log
4244
echo -e "Setting up the westend side of the bridge. Logs available at: $westend_init_log\n"
4345

@@ -47,7 +49,6 @@ if [[ $init -eq 1 ]]; then
4749
westend_init_pid=$!
4850
wait -n $rococo_init_pid $westend_init_pid
4951

50-
5152
$helper_script init-bridge-hub-rococo-local >> $rococo_init_log 2>&1 &
5253
rococo_init_pid=$!
5354
$helper_script init-bridge-hub-westend-local >> $westend_init_log 2>&1 &

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ messages_relayer_log=$logs_dir/relayer_messages.log
2929
echo -e "Starting rococo-westend messages relayer. Logs available at: $messages_relayer_log\n"
3030
start_background_process "$helper_script run-messages-relay" $messages_relayer_log messages_relayer_pid
3131

32-
run_zndsl ${BASH_SOURCE%/*}/rococo.zndsl $rococo_dir
33-
run_zndsl ${BASH_SOURCE%/*}/westend.zndsl $westend_dir
32+
run_zndsl ${BASH_SOURCE%/*}/rococo-bridge.zndsl $rococo_dir
33+
run_zndsl ${BASH_SOURCE%/*}/westend-bridge.zndsl $westend_dir
3434

3535
eval $__finality_relayer_pid="'$finality_relayer_pid'"
3636
eval $__parachains_relayer_pid="'$parachains_relayer_pid'"

bridges/testing/environments/rococo-westend/westend.zndsl renamed to bridges/testing/environments/rococo-westend/westend-bridge.zndsl

File renamed without changes.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Description: Check if the Westend parachains started producing blocks reliably
2+
Network: ./bridge_hub_westend_local_network.toml
3+
Creds: config
4+
5+
# ensure that initialization has completed
6+
asset-hub-westend-collator1: reports block height is at least 10 within 180 seconds
7+
bridge-hub-westend-collator1: reports block height is at least 10 within 180 seconds
8+

0 commit comments

Comments
 (0)