Factor out testnet automation SW version resolution (#10660)

(cherry picked from commit a15f60a291)

Co-authored-by: Trent Nelson <trent@solana.com>
This commit is contained in:
mergify[bot]
2020-06-17 17:31:11 +00:00
committed by GitHub
parent b6f484ddee
commit 800c409698
2 changed files with 22 additions and 18 deletions

View File

@ -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
}

View File

@ -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"
@ -285,11 +281,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"}