Disable |solana-install| check for edge/beta testnets (#4564)
The release tarball URL changes for these testnets, which causes the normal |solana-install| check to fail and the testnet is unnecessarily rebooted.
This commit is contained in:
parent
8f50c3dd2e
commit
aa4a7b0c73
|
@ -311,6 +311,9 @@ if ! $skipStart; then
|
||||||
if [[ -n $NO_LEDGER_VERIFY ]]; then
|
if [[ -n $NO_LEDGER_VERIFY ]]; then
|
||||||
args+=(-o noLedgerVerify)
|
args+=(-o noLedgerVerify)
|
||||||
fi
|
fi
|
||||||
|
if [[ -n $NO_INSTALL_CHECK ]]; then
|
||||||
|
args+=(-o noInstallCheck)
|
||||||
|
fi
|
||||||
if [[ -n $maybeHashesPerTick ]]; then
|
if [[ -n $maybeHashesPerTick ]]; then
|
||||||
# shellcheck disable=SC2206 # Do not want to quote $maybeHashesPerTick
|
# shellcheck disable=SC2206 # Do not want to quote $maybeHashesPerTick
|
||||||
args+=($maybeHashesPerTick)
|
args+=($maybeHashesPerTick)
|
||||||
|
|
|
@ -212,6 +212,7 @@ sanity() {
|
||||||
testnet-edge)
|
testnet-edge)
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
|
NO_INSTALL_CHECK=1 \
|
||||||
NO_LEDGER_VERIFY=1 \
|
NO_LEDGER_VERIFY=1 \
|
||||||
ci/testnet-sanity.sh edge-testnet-solana-com ec2 us-west-1a
|
ci/testnet-sanity.sh edge-testnet-solana-com ec2 us-west-1a
|
||||||
)
|
)
|
||||||
|
@ -228,6 +229,7 @@ sanity() {
|
||||||
testnet-beta)
|
testnet-beta)
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
|
NO_INSTALL_CHECK=1 \
|
||||||
NO_LEDGER_VERIFY=1 \
|
NO_LEDGER_VERIFY=1 \
|
||||||
ci/testnet-sanity.sh beta-testnet-solana-com ec2 us-west-1a
|
ci/testnet-sanity.sh beta-testnet-solana-com ec2 us-west-1a
|
||||||
)
|
)
|
||||||
|
|
|
@ -64,6 +64,7 @@ for zone in "$@"; do
|
||||||
${NO_LEDGER_VERIFY:+-o noLedgerVerify} \
|
${NO_LEDGER_VERIFY:+-o noLedgerVerify} \
|
||||||
${NO_VALIDATOR_SANITY:+-o noValidatorSanity} \
|
${NO_VALIDATOR_SANITY:+-o noValidatorSanity} \
|
||||||
${REJECT_EXTRA_NODES:+-o rejectExtraNodes} \
|
${REJECT_EXTRA_NODES:+-o rejectExtraNodes} \
|
||||||
|
${NO_INSTALL_CHECK:+-o noInstallCheck} \
|
||||||
$zone || ok=false
|
$zone || ok=false
|
||||||
|
|
||||||
net/net.sh logs
|
net/net.sh logs
|
||||||
|
|
|
@ -58,6 +58,7 @@ Operate a configured testnet
|
||||||
-F - Discard validator nodes that didn't bootup successfully
|
-F - Discard validator nodes that didn't bootup successfully
|
||||||
-o noLedgerVerify - Skip ledger verification
|
-o noLedgerVerify - Skip ledger verification
|
||||||
-o noValidatorSanity - Skip fullnode sanity
|
-o noValidatorSanity - Skip fullnode sanity
|
||||||
|
-o noInstallCheck - Skip solana-install sanity
|
||||||
-o rejectExtraNodes - Require the exact number of nodes
|
-o rejectExtraNodes - Require the exact number of nodes
|
||||||
|
|
||||||
stop-specific options:
|
stop-specific options:
|
||||||
|
@ -150,7 +151,7 @@ while getopts "h?T:t:o:f:rD:i:c:Fn:" opt "${shortArgs[@]}"; do
|
||||||
;;
|
;;
|
||||||
o)
|
o)
|
||||||
case $OPTARG in
|
case $OPTARG in
|
||||||
noLedgerVerify|noValidatorSanity|rejectExtraNodes)
|
noLedgerVerify|noValidatorSanity|rejectExtraNodes|noInstallCheck)
|
||||||
sanityExtraArgs="$sanityExtraArgs -o $OPTARG"
|
sanityExtraArgs="$sanityExtraArgs -o $OPTARG"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
|
@ -34,6 +34,7 @@ missing() {
|
||||||
|
|
||||||
ledgerVerify=true
|
ledgerVerify=true
|
||||||
validatorSanity=true
|
validatorSanity=true
|
||||||
|
installCheck=true
|
||||||
rejectExtraNodes=false
|
rejectExtraNodes=false
|
||||||
while [[ $1 = -o ]]; do
|
while [[ $1 = -o ]]; do
|
||||||
opt="$2"
|
opt="$2"
|
||||||
|
@ -45,6 +46,9 @@ while [[ $1 = -o ]]; do
|
||||||
noValidatorSanity)
|
noValidatorSanity)
|
||||||
validatorSanity=false
|
validatorSanity=false
|
||||||
;;
|
;;
|
||||||
|
noInstallCheck)
|
||||||
|
installCheck=false
|
||||||
|
;;
|
||||||
rejectExtraNodes)
|
rejectExtraNodes)
|
||||||
rejectExtraNodes=true
|
rejectExtraNodes=true
|
||||||
;;
|
;;
|
||||||
|
@ -168,7 +172,7 @@ else
|
||||||
echo "Note: validator sanity disabled"
|
echo "Note: validator sanity disabled"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -r update_manifest_keypair.json ]]; then
|
if $installCheck && [[ -r update_manifest_keypair.json ]]; then
|
||||||
echo "--- $sanityTargetIp: solana-install test"
|
echo "--- $sanityTargetIp: solana-install test"
|
||||||
|
|
||||||
(
|
(
|
||||||
|
|
Loading…
Reference in New Issue