From 12f3485a846e116bfe4f5d21e1ec29f9e5f27d4c Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Wed, 30 Aug 2023 22:51:08 +0000 Subject: [PATCH] ci: use compose discovery --- --- a/.github/workflows/xcm.yml +++ b/.github/workflows/xcm.yml @@ -277,10 +277,15 @@ - name: Install baedeker uses: UniqueNetwork/baedeker-action/setup@built + - name: Setup library + run: mkdir -p .baedeker/vendor/ && git clone https://github.com/UniqueNetwork/baedeker-library .baedeker/vendor/baedeker-library + - name: Start network uses: UniqueNetwork/baedeker-action@built id: bdk with: + jpath: | + .baedeker/vendor inputs: | .baedeker/xcm-${{ matrix.network }}.jsonnet snippet:(import 'baedeker-library/ops/rewrites.libsonnet').rewriteNodePaths({'bin/polkadot':{dockerImage:'uniquenetwork/builder-polkadot:${{ matrix.relay_branch }}'}}) @@ -302,21 +307,12 @@ run: | yarn install yarn add mochawesome + # Wanted by both wait_for_first_block and yarn polkadot-types + export RPC_URL="${RELAY_OPAL_HTTP_URL:-${RELAY_QUARTZ_HTTP_URL:-${RELAY_UNIQUE_HTTP_URL:-}}}" ./scripts/wait_for_first_block.sh echo "Ready to start tests" yarn polkadot-types NOW=$(date +%s) && yarn ${{ matrix.runtest }} --reporter mochawesome --reporter-options reportFilename=test-${NOW} - env: - RPC_URL: http://${{ steps.bdk.outputs.balancer }}/relay-${{ matrix.network }}/ - SUBSTRATE_URL: ws://${{ steps.bdk.outputs.balancer }}/relay-${{ matrix.network }}/ - RELAY_URL: ws://${{ steps.bdk.outputs.balancer }}/relay/ - ACALA_URL: ws://${{ steps.bdk.outputs.balancer }}/relay-acala/ - MOONBEAM_URL: ws://${{ steps.bdk.outputs.balancer }}/relay-moonbeam/ - ASTAR_URL: ws://${{ steps.bdk.outputs.balancer }}/relay-astar/ - SHIDEN_URL: ws://${{ steps.bdk.outputs.balancer }}/relay-shiden/ - WESTMINT_URL: ws://${{ steps.bdk.outputs.balancer }}/relay-westmint/ - STATEMINE_URL: ws://${{ steps.bdk.outputs.balancer }}/relay-statemine/ - STATEMINT_URL: ws://${{ steps.bdk.outputs.balancer }}/relay-statemint/ - name: XCM Test Report uses: phoenix-actions/test-reporting@v10 --- a/tests/src/config.ts +++ b/tests/src/config.ts @@ -17,17 +17,17 @@ import process from 'process'; const config = { - substrateUrl: process.env.SUBSTRATE_URL || 'ws://127.0.0.1:9944', relayUrl: process.env.RELAY_URL || 'ws://127.0.0.1:9844', - acalaUrl: process.env.ACALA_URL || 'ws://127.0.0.1:9946', - karuraUrl: process.env.ACALA_URL || 'ws://127.0.0.1:9946', - moonbeamUrl: process.env.MOONBEAM_URL || 'ws://127.0.0.1:9947', - moonriverUrl: process.env.MOONBEAM_URL || 'ws://127.0.0.1:9947', - astarUrl: process.env.ASTAR_URL || 'ws://127.0.0.1:9949', - shidenUrl: process.env.SHIDEN_URL || 'ws://127.0.0.1:9949', - westmintUrl: process.env.WESTMINT_URL || 'ws://127.0.0.1:9948', - statemineUrl: process.env.STATEMINE_URL || 'ws://127.0.0.1:9948', - statemintUrl: process.env.STATEMINT_URL || 'ws://127.0.0.1:9948', + substrateUrl: process.env.RELAY_OPAL_URL || process.env.RELAY_QUARTZ_URL || process.env.RELAY_UNIQUE_URL || 'ws://127.0.0.1:9944', + acalaUrl: process.env.RELAY_ACALA_URL || 'ws://127.0.0.1:9946', + karuraUrl: process.env.RELAY_KARURA_URL || 'ws://127.0.0.1:9946', + moonbeamUrl: process.env.RELAY_MOONBEAM_URL || 'ws://127.0.0.1:9947', + moonriverUrl: process.env.RELAY_MOONRIVER_URL || 'ws://127.0.0.1:9947', + astarUrl: process.env.RELAY_ASTAR_URL || 'ws://127.0.0.1:9949', + shidenUrl: process.env.RELAY_SHIDEN_URL || 'ws://127.0.0.1:9949', + westmintUrl: process.env.RELAY_WESTMINT_URL || 'ws://127.0.0.1:9948', + statemineUrl: process.env.RELAY_STATEMINE_URL || 'ws://127.0.0.1:9948', + statemintUrl: process.env.RELAY_STATEMINT_URL || 'ws://127.0.0.1:9948', }; export default config; --- a/tests/src/xcm/xcmOpal.test.ts +++ b/tests/src/xcm/xcmOpal.test.ts @@ -18,8 +18,8 @@ import config from '../config'; import {itSub, expect, describeXCM, usingPlaygrounds, usingWestmintPlaygrounds, usingRelayPlaygrounds} from '../util'; -const STATEMINE_CHAIN = 1000; -const UNIQUE_CHAIN = 2095; +const STATEMINE_CHAIN = +(process.env.RELAY_WESTMINT_ID || 1000); +const UNIQUE_CHAIN = +(process.env.RELAY_OPAL_ID || 2095); const relayUrl = config.relayUrl; const westmintUrl = config.westmintUrl; --- a/tests/src/xcm/xcmQuartz.test.ts +++ b/tests/src/xcm/xcmQuartz.test.ts @@ -19,11 +19,11 @@ import {itSub, expect, describeXCM, usingPlaygrounds, usingKaruraPlaygrounds, usingRelayPlaygrounds, usingMoonriverPlaygrounds, usingStateminePlaygrounds, usingShidenPlaygrounds} from '../util'; import {DevUniqueHelper, Event} from '../util/playgrounds/unique.dev'; -const QUARTZ_CHAIN = 2095; -const STATEMINE_CHAIN = 1000; -const KARURA_CHAIN = 2000; -const MOONRIVER_CHAIN = 2023; -const SHIDEN_CHAIN = 2007; +const QUARTZ_CHAIN = +(process.env.RELAY_QUARTZ_ID || 2095); +const STATEMINE_CHAIN = +(process.env.RELAY_STATEMINE_ID || 1000); +const KARURA_CHAIN = +(process.env.RELAY_KARURA_ID || 2000); +const MOONRIVER_CHAIN = +(process.env.RELAY_MOONRIVER_ID || 2023); +const SHIDEN_CHAIN = +(process.env.RELAY_SHIDEN_ID || 2007); const STATEMINE_PALLET_INSTANCE = 50; --- a/tests/src/xcm/xcmUnique.test.ts +++ b/tests/src/xcm/xcmUnique.test.ts @@ -19,11 +19,11 @@ import {itSub, expect, describeXCM, usingPlaygrounds, usingAcalaPlaygrounds, usingRelayPlaygrounds, usingMoonbeamPlaygrounds, usingStatemintPlaygrounds, usingAstarPlaygrounds} from '../util'; import {DevUniqueHelper, Event} from '../util/playgrounds/unique.dev'; -const UNIQUE_CHAIN = 2037; -const STATEMINT_CHAIN = 1000; -const ACALA_CHAIN = 2000; -const MOONBEAM_CHAIN = 2004; -const ASTAR_CHAIN = 2006; +const UNIQUE_CHAIN = +(process.env.RELAY_UNIQUE_ID || 2037); +const STATEMINT_CHAIN = +(process.env.RELAY_STATEMINT_ID || 1000); +const ACALA_CHAIN = +(process.env.RELAY_ACALA_ID || 2000); +const MOONBEAM_CHAIN = +(process.env.RELAY_MOONBEAM_ID || 2004); +const ASTAR_CHAIN = +(process.env.RELAY_ASTAR_ID || 2006); const STATEMINT_PALLET_INSTANCE = 50; -- gitstuff