diff --git a/ci/localnet-sanity.sh b/ci/localnet-sanity.sh index c188e0dd76..820eec92a7 100755 --- a/ci/localnet-sanity.sh +++ b/ci/localnet-sanity.sh @@ -294,7 +294,7 @@ flag_error() { } if ! $skipSetup; then - multinode-demo/setup.sh --hashes-per-tick auto + multinode-demo/setup.sh else verifyLedger fi diff --git a/ci/testnet-manager.sh b/ci/testnet-manager.sh index a1cdcb0275..0d05d67234 100755 --- a/ci/testnet-manager.sh +++ b/ci/testnet-manager.sh @@ -325,8 +325,7 @@ deploy() { ${skipCreate:+-e} \ ${skipStart:+-s} \ ${maybeStop:+-S} \ - ${maybeDelete:+-D} \ - --hashes-per-tick auto + ${maybeDelete:+-D} ) ;; testnet-edge-perf) @@ -340,8 +339,7 @@ deploy() { ${skipCreate:+-e} \ ${skipStart:+-s} \ ${maybeStop:+-S} \ - ${maybeDelete:+-D} \ - --hashes-per-tick auto + ${maybeDelete:+-D} ) ;; testnet-beta) @@ -353,8 +351,7 @@ deploy() { ${skipCreate:+-e} \ ${skipStart:+-s} \ ${maybeStop:+-S} \ - ${maybeDelete:+-D} \ - --hashes-per-tick auto + ${maybeDelete:+-D} ) ;; testnet-beta-perf) @@ -368,8 +365,7 @@ deploy() { ${skipCreate:+-e} \ ${skipStart:+-s} \ ${maybeStop:+-S} \ - ${maybeDelete:+-D} \ - --hashes-per-tick auto + ${maybeDelete:+-D} ) ;; testnet) @@ -386,7 +382,8 @@ deploy() { ${skipCreate:+-e} \ ${maybeSkipStart:+-s} \ ${maybeStop:+-S} \ - ${maybeDelete:+-D} + ${maybeDelete:+-D} \ + --hashes-per-tick sleep if [[ -n $GCE_NODE_COUNT ]]; then # shellcheck disable=SC2068 @@ -396,7 +393,8 @@ deploy() { ${skipStart:+-s} \ ${maybeStop:+-S} \ ${maybeDelete:+-D} \ - -x + -x \ + --hashes-per-tick sleep fi ) ;; @@ -413,8 +411,7 @@ deploy() { ${skipCreate:+-e} \ ${skipStart:+-s} \ ${maybeStop:+-S} \ - ${maybeDelete:+-D} \ - --hashes-per-tick auto + ${maybeDelete:+-D} ) ;; testnet-demo) @@ -434,8 +431,7 @@ deploy() { ${skipCreate:+-e} \ ${maybeSkipStart:+-s} \ ${maybeStop:+-S} \ - ${maybeDelete:+-D} \ - --hashes-per-tick auto + ${maybeDelete:+-D} if [[ -n $GCE_LOW_QUOTA_NODE_COUNT ]]; then # shellcheck disable=SC2068 @@ -446,8 +442,7 @@ deploy() { ${skipCreate:+-e} \ ${skipStart:+-s} \ ${maybeStop:+-S} \ - ${maybeDelete:+-D} \ - --hashes-per-tick auto + ${maybeDelete:+-D} fi ) ;; diff --git a/multinode-demo/setup.sh b/multinode-demo/setup.sh index 73bb486b20..87b17a4304 100755 --- a/multinode-demo/setup.sh +++ b/multinode-demo/setup.sh @@ -24,7 +24,7 @@ default_arg --mint "$SOLANA_CONFIG_DIR"/mint-keypair.json default_arg --lamports 100000000000000 default_arg --bootstrap-leader-lamports 424242 default_arg --lamports-per-signature 1 -default_arg --hashes-per-tick sleep +default_arg --hashes-per-tick auto $solana_genesis "${args[@]}" test -d "$SOLANA_RSYNC_CONFIG_DIR"/ledger