Skip to content

Commit

Permalink
fix(deployment): remove dependency on HELPER_BINARY
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelfig committed Feb 6, 2024
1 parent a1cfba8 commit e7fb9f5
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 13 deletions.
1 change: 0 additions & 1 deletion packages/deployment/ansible/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
vars:
- service: ag-chain-cosmos
- APPDIR: "{{lookup('pipe', 'pwd')}}/../.."
- HELPER_BINARY: "{{lookup('env', 'GOBIN') or ((lookup('env', 'GOPATH') or '/usr/local') + '/bin')}}/agd"
roles:
- stop
- copy
Expand Down
1 change: 0 additions & 1 deletion packages/deployment/ansible/copy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@
vars:
- service: ag-chain-cosmos
- APPDIR: "{{lookup('pipe', 'pwd')}}/../.."
- HELPER_BINARY: "{{lookup('env', 'GOBIN') or ((lookup('env', 'GOPATH') or '/usr/local') + '/bin')}}/agd"
roles:
- copy
1 change: 0 additions & 1 deletion packages/deployment/ansible/prepare-cosmos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
vars:
- service: ag-chain-cosmos
- CHAIN_NAME: "{{ lookup('file', SETUP_HOME + '/' + service + '/chain-name.txt') }}"
- HELPER_BINARY: "{{lookup('env', 'GOBIN') or ((lookup('env', 'GOPATH') or '/usr/local') + '/bin')}}/agd"
- APPDIR: "{{lookup('pipe', 'pwd')}}/../.."
roles:
- copy
Expand Down
14 changes: 6 additions & 8 deletions packages/deployment/ansible/roles/copy/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
---
- name: Synchronize helper
synchronize:
src: '{{HELPER_BINARY}}'
dest: /usr/local/bin/
mode: push
use_ssh_args: true
when: HELPER_BINARY is defined

- name: 'Synchronize Agoric SDK {{ AGORIC_SDK }}'
synchronize:
src: '{{ AGORIC_SDK }}/'
Expand All @@ -19,6 +11,12 @@
mode: push
use_ssh_args: true

- name: 'Symlink agd'
file:
src: '/usr/src/agoric-sdk/bin/agd'
dest: '/usr/local/bin/agd'
state: link

- name: 'Symlink ag-chain-cosmos'
file:
src: '/usr/src/agoric-sdk/packages/cosmic-swingset/bin/ag-chain-cosmos'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ show-faucet-address)
esac

networkName=$(basename "$thisdir")
if netconfig=$(curl "https://$networkName.agoric.net/network-config"); then
if netconfig=$(curl -s "https://$networkName.agoric.net/network-config"); then
chainName=$(echo "$netconfig" | jq -r .chainName)
read -r -a origRpcAddrs <<<"$(echo "$netconfig" | jq -r .rpcAddrs[])"
else
Expand Down
4 changes: 3 additions & 1 deletion packages/deployment/scripts/integration-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ else
echo "Running chain without loadgen" >&2
fi

set -x

SOLO_ADDR=
VAT_CONFIG=
RESULTSDIR=${RESULTSDIR-"$NETWORK_NAME/results"}
Expand Down Expand Up @@ -69,7 +71,7 @@ then
cp ag-chain-cosmos/data/genesis.json "$RESULTSDIR/genesis.json"
cp "$AG_SETUP_COSMOS_HOME/ag-chain-cosmos/data/genesis.json" "$RESULTSDIR/genesis.json"
cd "$LOADGEN"
SOLO_COINS=40000000000uist PATH="$thisdir/../bin:$PATH" \
SOLO_COINS=40000000000uist PATH="$thisdir/../bin:$SDK_SRC/bin:$PATH" \
"$AG_SETUP_COSMOS_HOME/faucet-helper.sh" add-egress loadgen "$SOLO_ADDR"
SLOGSENDER=@agoric/telemetry/src/otel-trace.js SOLO_SLOGSENDER="" \
SLOGSENDER_FAIL_ON_ERROR=1 SLOGSENDER_AGENT=process \
Expand Down

0 comments on commit e7fb9f5

Please sign in to comment.