From b8261d7d833126a8cd42480e70a5a4a10d35b5aa Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 8 Nov 2018 22:01:45 -0800 Subject: [PATCH] Determine network version for tar and local deploys --- net/net.sh | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/net/net.sh b/net/net.sh index 6da2e9c1a..e5722ab0a 100755 --- a/net/net.sh +++ b/net/net.sh @@ -327,15 +327,28 @@ start() { clientDeployTime=$SECONDS $metricsWriteDatapoint "testnet-deploy net-start-complete=1" - if [[ $deployMethod = "snap" ]]; then - declare networkVersion=unknown + declare networkVersion=unknown + case $deployMethod in + snap) IFS=\ read -r _ networkVersion _ < <( ssh "${sshOptions[@]}" "$leaderIp" \ "snap info solana | grep \"^installed:\"" ) networkVersion=${networkVersion/0+git./} - $metricsWriteDatapoint "testnet-deploy version=\"$networkVersion\"" - fi + ;; + tar) + networkVersion="$( + tail -n1 "$SOLANA_ROOT"/solana-release/version.txt || echo "tar-unknown" + )" + ;; + local) + networkVersion="$(git rev-parse HEAD || echo local-unknown)" + ;; + *) + usage "Internal error: invalid deployMethod: $deployMethod" + ;; + esac + $metricsWriteDatapoint "testnet-deploy version=\"${networkVersion:0:9}\"" echo echo "+++ Deployment Successful"