fixup! ci: test against go-relayer

Agoric · Oct 17, 2024 · 4414f4c · 4414f4c
1 parent 1e2421a
commit 4414f4c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -10,6 +10,7 @@ const binaryArgs = [
   'agoriclocal-genesis-0',
   '-c',
   'validator',
+  ...(process.env.NAMESPACE ? ['-n', process.env.NAMESPACE] : []),
   '--tty=false',
   '--',
   'agd',