Add public IP address option to automation (#6899)
* Add public IP address option to automation * Make public IP use the default behavior
This commit is contained in:
Dan Albert
GitHub
parent
5670cafda4
commit
2688ae614c
|
|
@ -14,6 +14,7 @@ steps:
|
|||
NUMBER_OF_CLIENT_NODES: 2
|
||||
CLIENT_OPTIONS: "bench-tps=2=--tx_count 15000 --thread-batch-sleep-ms 250"
|
||||
TESTNET_ZONES: "us-west-1a,us-west-1c,us-east-1a,eu-west-1a"
|
||||
USE_PUBLIC_IP_ADDRESSES: "true"
|
||||
ADDITIONAL_FLAGS: ""
|
||||
agents:
|
||||
- "queue=testnet-deploy"
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
steps:
|
||||
- command: "system-test/testnet-performance/testnet-automation.sh"
|
||||
label: "AWS - CPU Only 5 Node"
|
||||
env:
|
||||
UPLOAD_RESULTS_TO_SLACK: "true"
|
||||
CLOUD_PROVIDER: "ec2"
|
||||
TESTNET_TAG: "aws-perf-cpu-only"
|
||||
RAMP_UP_TIME: 0
|
||||
TEST_DURATION_SECONDS: 300
|
||||
NUMBER_OF_VALIDATOR_NODES: 5
|
||||
ENABLE_GPU: "false"
|
||||
# Up to 3.1 GHz Intel Xeon® Platinum 8175, 16 vCPU, 64GB RAM
|
||||
VALIDATOR_NODE_MACHINE_TYPE: "m5.4xlarge"
|
||||
NUMBER_OF_CLIENT_NODES: 2
|
||||
CLIENT_OPTIONS: "bench-tps=2=--tx_count 15000 --thread-batch-sleep-ms 250"
|
||||
TESTNET_ZONES: "us-west-1a"
|
||||
ADDITIONAL_FLAGS: ""
|
||||
agents:
|
||||
- "queue=testnet-deploy"
|
||||
|
|
@ -14,6 +14,7 @@ steps:
|
|||
NUMBER_OF_CLIENT_NODES: 2
|
||||
CLIENT_OPTIONS: "bench-tps=2=--tx_count 15000 --thread-batch-sleep-ms 250"
|
||||
TESTNET_ZONES: "us-west-1a,us-west-1c,us-east-1a,eu-west-1a"
|
||||
USE_PUBLIC_IP_ADDRESSES: "true"
|
||||
ADDITIONAL_FLAGS: ""
|
||||
agents:
|
||||
- "queue=testnet-deploy"
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ steps:
|
|||
NUMBER_OF_CLIENT_NODES: 1
|
||||
CLIENT_OPTIONS: "bench-tps=1=--tx_count 80000 --thread-batch-sleep-ms 1000"
|
||||
TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
|
||||
USE_PUBLIC_IP_ADDRESSES: "true"
|
||||
ADDITIONAL_FLAGS: ""
|
||||
agents:
|
||||
- "queue=testnet-deploy"
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ steps:
|
|||
NUMBER_OF_CLIENT_NODES: 2
|
||||
CLIENT_OPTIONS: "bench-tps=2=--tx_count 15000 --thread-batch-sleep-ms 250"
|
||||
TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
|
||||
USE_PUBLIC_IP_ADDRESSES: "true"
|
||||
ADDITIONAL_FLAGS: "--dedicated"
|
||||
agents:
|
||||
- "queue=testnet-deploy"
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ steps:
|
|||
NUMBER_OF_CLIENT_NODES: 2
|
||||
CLIENT_OPTIONS: "bench-tps=2=--tx_count 15000 --thread-batch-sleep-ms 250"
|
||||
TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
|
||||
USE_PUBLIC_IP_ADDRESSES: "true"
|
||||
ADDITIONAL_FLAGS: "--dedicated"
|
||||
agents:
|
||||
- "queue=testnet-deploy"
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ steps:
|
|||
CLIENT_OPTIONS: "bench-tps=2=--tx_count 15000 --thread-batch-sleep-ms 250"
|
||||
TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
|
||||
ALLOW_BOOT_FAILURES: "true"
|
||||
USE_PUBLIC_IP_ADDRESSES: "true"
|
||||
ADDITIONAL_FLAGS: "--dedicated"
|
||||
agents:
|
||||
- "queue=testnet-deploy"
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ steps:
|
|||
NUMBER_OF_CLIENT_NODES: 2
|
||||
CLIENT_OPTIONS: "bench-tps=2=--tx_count 15000 --thread-batch-sleep-ms 250"
|
||||
TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
|
||||
USE_PUBLIC_IP_ADDRESSES: "true"
|
||||
ADDITIONAL_FLAGS: "--dedicated"
|
||||
agents:
|
||||
- "queue=testnet-deploy"
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ steps:
|
|||
NUMBER_OF_CLIENT_NODES: 2
|
||||
CLIENT_OPTIONS: "bench-tps=2=--tx_count 15000 --thread-batch-sleep-ms 250"
|
||||
TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
|
||||
USE_PUBLIC_IP_ADDRESSES: "true"
|
||||
ADDITIONAL_FLAGS: "--dedicated"
|
||||
agents:
|
||||
- "queue=testnet-deploy"
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ steps:
|
|||
CLIENT_OPTIONS: "bench-tps=2=--tx_count 15000 --thread-batch-sleep-ms 250"
|
||||
TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
|
||||
ALLOW_BOOT_FAILURES: "true"
|
||||
USE_PUBLIC_IP_ADDRESSES: "true"
|
||||
ADDITIONAL_FLAGS: "--dedicated"
|
||||
agents:
|
||||
- "queue=testnet-deploy"
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ function launchTestnet() {
|
|||
-d pd-ssd \
|
||||
-n "$NUMBER_OF_VALIDATOR_NODES" -c "$NUMBER_OF_CLIENT_NODES" \
|
||||
$maybeCustomMachineType "$VALIDATOR_NODE_MACHINE_TYPE" $maybeEnableGpu \
|
||||
-p "$TESTNET_TAG" $maybeCreateAllowBootFailures \
|
||||
-p "$TESTNET_TAG" $maybeCreateAllowBootFailures $maybePublicIpAddresses \
|
||||
${TESTNET_CLOUD_ZONES[@]/#/"-z "} \
|
||||
${ADDITIONAL_FLAGS[@]/#/" "}
|
||||
;;
|
||||
|
|
@ -114,7 +114,7 @@ function launchTestnet() {
|
|||
net/ec2.sh create \
|
||||
-n "$NUMBER_OF_VALIDATOR_NODES" -c "$NUMBER_OF_CLIENT_NODES" \
|
||||
$maybeCustomMachineType "$VALIDATOR_NODE_MACHINE_TYPE" $maybeEnableGpu \
|
||||
-p "$TESTNET_TAG" $maybeCreateAllowBootFailures \
|
||||
-p "$TESTNET_TAG" $maybeCreateAllowBootFailures $maybePublicIpAddresses \
|
||||
${TESTNET_CLOUD_ZONES[@]/#/"-z "} \
|
||||
${ADDITIONAL_FLAGS[@]/#/" "}
|
||||
;;
|
||||
|
|
@ -123,7 +123,8 @@ function launchTestnet() {
|
|||
# shellcheck disable=SC2086
|
||||
net/colo.sh create \
|
||||
-n "$NUMBER_OF_VALIDATOR_NODES" -c "$NUMBER_OF_CLIENT_NODES" $maybeEnableGpu \
|
||||
-p "$TESTNET_TAG" ${ADDITIONAL_FLAGS[@]/#/" "}
|
||||
-p "$TESTNET_TAG" $maybePublicIpAddresses \
|
||||
${ADDITIONAL_FLAGS[@]/#/" "}
|
||||
;;
|
||||
*)
|
||||
echo "Error: Unsupported cloud provider: $CLOUD_PROVIDER"
|
||||
|
|
@ -256,6 +257,13 @@ if [[ "$ALLOW_BOOT_FAILURES" = "true" ]] ; then
|
|||
maybeStartAllowBootFailures="-F"
|
||||
fi
|
||||
|
||||
if [[ -z $USE_PUBLIC_IP_ADDRESSES ]] ; then
|
||||
USE_PUBLIC_IP_ADDRESSES=false
|
||||
fi
|
||||
if [[ "$USE_PUBLIC_IP_ADDRESSES" = "true" ]] ; then
|
||||
maybePublicIpAddresses="-P"
|
||||
fi
|
||||
|
||||
if [[ -z $CHANNEL ]]; then
|
||||
echo --- downloading tar from build artifacts
|
||||
buildkite-agent artifact download "solana-release*.tar.bz2" .
|
||||
|
|
|
|||
Loading…
Reference in New Issue