From 18463aa8466e5a5d64e8f11dd68814c570c35008 Mon Sep 17 00:00:00 2001 From: behzad nouri Date: Wed, 11 Aug 2021 10:53:31 -0400 Subject: [PATCH] removes redundant allow-private-addr from system tests Following https://github.com/solana-labs/solana/pull/19130 if gce.sh creat is invoked without -P then --allow-private-addr is implied: https://github.com/solana-labs/solana/blob/4cc1b1504/net/common.sh#L68-L73 Therefore tests only need to specify: USE_PUBLIC_IP_ADDRESSES: "false" --- system-test/partition-testcases/gce-5-node-3-partition.yml | 1 - .../gce-5-node-single-region-2-partitions.yml | 1 - .../partition-testcases/gce-partition-once-then-stabilize.yml | 1 - system-test/partition-testcases/gce-partition-with-offline.yml | 1 - .../gce-perf-stability-5-node-single-region.yml | 1 - 5 files changed, 5 deletions(-) diff --git a/system-test/partition-testcases/gce-5-node-3-partition.yml b/system-test/partition-testcases/gce-5-node-3-partition.yml index 470a2defca..2d9ad0a19f 100755 --- a/system-test/partition-testcases/gce-5-node-3-partition.yml +++ b/system-test/partition-testcases/gce-5-node-3-partition.yml @@ -12,7 +12,6 @@ steps: CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" TESTNET_ZONES: "us-west1-a" USE_PUBLIC_IP_ADDRESSES: "false" - ALLOW_PRIVATE_ADDR: "true" ADDITIONAL_FLAGS: "--dedicated" APPLY_PARTITIONS: "true" NETEM_CONFIG_FILE: "system-test/netem-configs/partial-loss-three-partitions" diff --git a/system-test/partition-testcases/gce-5-node-single-region-2-partitions.yml b/system-test/partition-testcases/gce-5-node-single-region-2-partitions.yml index 8c185836d3..ae9ff6f1d7 100755 --- a/system-test/partition-testcases/gce-5-node-single-region-2-partitions.yml +++ b/system-test/partition-testcases/gce-5-node-single-region-2-partitions.yml @@ -12,7 +12,6 @@ steps: CLIENT_OPTIONS: "bench-tps=1=--tx_count 5000 --thread-batch-sleep-ms 250" TESTNET_ZONES: "us-west1-a" USE_PUBLIC_IP_ADDRESSES: "false" - ALLOW_PRIVATE_ADDR: "true" ADDITIONAL_FLAGS: "--dedicated" APPLY_PARTITIONS: "true" NETEM_CONFIG_FILE: "system-test/netem-configs/complete-loss-two-partitions" diff --git a/system-test/partition-testcases/gce-partition-once-then-stabilize.yml b/system-test/partition-testcases/gce-partition-once-then-stabilize.yml index 5c29a18fb2..f0117213be 100755 --- a/system-test/partition-testcases/gce-partition-once-then-stabilize.yml +++ b/system-test/partition-testcases/gce-partition-once-then-stabilize.yml @@ -12,7 +12,6 @@ steps: CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" TESTNET_ZONES: "us-west1-a" USE_PUBLIC_IP_ADDRESSES: "false" - ALLOW_PRIVATE_ADDR: "true" ADDITIONAL_FLAGS: "--dedicated" APPLY_PARTITIONS: "true" NETEM_CONFIG_FILE: "system-test/netem-configs/partial-loss-three-partitions" diff --git a/system-test/partition-testcases/gce-partition-with-offline.yml b/system-test/partition-testcases/gce-partition-with-offline.yml index 04954b4107..9fd6904a07 100755 --- a/system-test/partition-testcases/gce-partition-with-offline.yml +++ b/system-test/partition-testcases/gce-partition-with-offline.yml @@ -12,7 +12,6 @@ steps: CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" TESTNET_ZONES: "us-west1-a" USE_PUBLIC_IP_ADDRESSES: "false" - ALLOW_PRIVATE_ADDR: "true" ADDITIONAL_FLAGS: "--dedicated" APPLY_PARTITIONS: "true" NETEM_CONFIG_FILE: "system-test/netem-configs/complete-loss-two-partitions" diff --git a/system-test/stability-testcases/gce-perf-stability-5-node-single-region.yml b/system-test/stability-testcases/gce-perf-stability-5-node-single-region.yml index 5136286621..7970c27d15 100755 --- a/system-test/stability-testcases/gce-perf-stability-5-node-single-region.yml +++ b/system-test/stability-testcases/gce-perf-stability-5-node-single-region.yml @@ -15,6 +15,5 @@ steps: USE_PUBLIC_IP_ADDRESSES: "false" ADDITIONAL_FLAGS: "--dedicated" TEST_TYPE: "fixed_duration" - ALLOW_PRIVATE_ADDR: "true" agents: - "queue=gce-deploy"