From a15f60a2911793ab2702de9e6da212a15d336e80 Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Tue, 9 Jun 2020 19:02:36 -0600
Subject: [PATCH] Factor out testnet automation SW version resolution

---
 system-test/automation_utils.sh   | 13 +++++++++++++
 system-test/testnet-automation.sh | 27 +++++++++------------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/system-test/automation_utils.sh b/system-test/automation_utils.sh
index 7566760efa..136399d6e7 100755
--- a/system-test/automation_utils.sh
+++ b/system-test/automation_utils.sh
@@ -249,3 +249,16 @@ EOF
   --data "$payLoad" \
   "$SLACK_WEBHOOK_URL"
 }
+
+function get_net_launch_software_version_launch_args() {
+  declare channel="${1?}"
+  declare artifact_basename="${2?}"
+  declare return_varname="${3:?}"
+  if [[ -n $channel ]]; then
+    eval "$return_varname=-t\ \$channel"
+  else
+    execution_step "Downloading tar from build artifacts (${artifact_basename})"
+    buildkite-agent artifact download "${artifact_basename}*.tar.bz2" .
+    eval "$return_varname=-T\ \${artifact_basename}*.tar.bz2"
+  fi
+}
diff --git a/system-test/testnet-automation.sh b/system-test/testnet-automation.sh
index 9b94a18b2f..f8ed313515 100755
--- a/system-test/testnet-automation.sh
+++ b/system-test/testnet-automation.sh
@@ -120,19 +120,15 @@ function launch_testnet() {
   fi
 
   execution_step "Starting bootstrap node and ${NUMBER_OF_VALIDATOR_NODES} validator nodes"
-  if [[ -n $CHANNEL ]]; then
-    # shellcheck disable=SC2068
-    # shellcheck disable=SC2086
-    "${REPO_ROOT}"/net/net.sh start -t "$CHANNEL" \
-      -c idle=$NUMBER_OF_CLIENT_NODES $maybeStartAllowBootFailures \
-      --gpu-mode $startGpuMode
-  else
-    # shellcheck disable=SC2068
-    # shellcheck disable=SC2086
-    "${REPO_ROOT}"/net/net.sh start -T solana-release*.tar.bz2 \
-      -c idle=$NUMBER_OF_CLIENT_NODES $maybeStartAllowBootFailures \
-      --gpu-mode $startGpuMode
-  fi
+
+  declare -g version_args
+  get_net_launch_software_version_launch_args "$CHANNEL" "solana-release" version_args
+
+  # shellcheck disable=SC2068
+  # shellcheck disable=SC2086
+  "${REPO_ROOT}"/net/net.sh start $version_args \
+    -c idle=$NUMBER_OF_CLIENT_NODES $maybeStartAllowBootFailures \
+    --gpu-mode $startGpuMode
 
   execution_step "Waiting for bootstrap validator's stake to fall below ${BOOTSTRAP_VALIDATOR_MAX_STAKE_THRESHOLD}%"
   wait_for_bootstrap_validator_stake_drop "$BOOTSTRAP_VALIDATOR_MAX_STAKE_THRESHOLD"
@@ -288,11 +284,6 @@ if [[ -n $missingParameters ]]; then
   exit 1
 fi
 
-if [[ -z $CHANNEL ]]; then
-  execution_step "Downloading tar from build artifacts"
-  buildkite-agent artifact download "solana-release*.tar.bz2" .
-fi
-
 maybeClientOptions=${CLIENT_OPTIONS:+"-c"}
 maybeCustomMachineType=${VALIDATOR_NODE_MACHINE_TYPE:+"--custom-machine-type"}