diff --git a/.github/workflows/multichain-e2e-template.yml b/.github/workflows/multichain-e2e-template.yml index 39c8b4ea6941..2e62aa845354 100644 --- a/.github/workflows/multichain-e2e-template.yml +++ b/.github/workflows/multichain-e2e-template.yml @@ -75,11 +75,8 @@ jobs: working-directory: ./agoric-sdk/multichain-testing - name: Fund Provision Pool - run: make fund-provision-pool + run: make fund-provision-pool NAME=agoric-multichain-${{ inputs.relayer-type }} working-directory: ./agoric-sdk/multichain-testing - env: - AGORIC_RPC_PORT: ${{ inputs.agoric-rpc-port }} - AGORIC_REST_PORT: ${{ inputs.agoric-rest-port }} - name: Ensure ports are forwarded run: | @@ -95,6 +92,7 @@ jobs: REGISTRY_PORT: ${{ inputs.registry-port }} AGORIC_RPC_PORT: ${{ inputs.agoric-rpc-port }} AGORIC_REST_PORT: ${{ inputs.agoric-rest-port }} + NAMESPACE: agoric-multichain-${{ inputs.relayer-type }} - name: Run @agoric/multichain-testing E2E Tests run: yarn test @@ -105,6 +103,7 @@ jobs: AGORIC_RPC_PORT: ${{ inputs.agoric-rpc-port }} AGORIC_REST_PORT: ${{ inputs.agoric-rest-port }} FILE: ${{ inputs.config }} + NAMESPACE: agoric-multichain-${{ inputs.relayer-type }} - name: Capture and print agoric validator logs if: always() diff --git a/multichain-testing/Makefile b/multichain-testing/Makefile index fdd8eba90ea8..8716c85a3317 100644 --- a/multichain-testing/Makefile +++ b/multichain-testing/Makefile @@ -73,7 +73,7 @@ add-address: kubectl exec -i agoriclocal-genesis-0 -c validator -- agd keys add user1 fund-provision-pool: - kubectl exec -i agoriclocal-genesis-0 -c validator -- agd tx bank send faucet $(PROVISION_POOL_ADDR) 1000000000uist -y -b block + kubectl exec -i agoriclocal-genesis-0 -c validator -n $(NAME) -- agd tx bank send faucet $(PROVISION_POOL_ADDR) 1000000000uist -y -b block override-chain-registry: node_modules/.bin/tsx scripts/fetch-starship-chain-info.ts && \ diff --git a/multichain-testing/tools/agd-lib.js b/multichain-testing/tools/agd-lib.js index a301945f1486..afe4d9b80592 100644 --- a/multichain-testing/tools/agd-lib.js +++ b/multichain-testing/tools/agd-lib.js @@ -10,6 +10,7 @@ const binaryArgs = [ 'agoriclocal-genesis-0', '-c', 'validator', + ...(process.env.NAMESPACE ? ['-n', process.env.NAMESPACE] : []), '--tty=false', '--', 'agd',