Update testnet testcases to point at new buildkite agent queues (sola…

…na-labs#7544) automerge
kruelmanta · Dec 18, 2019 · 6a8f6fb · 6a8f6fb
1 parent 807e930
commit 6a8f6fb
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 68 deletions.
diff --git a/system-test/performance-testcases/aws-cpu-only-perf-10-node.yml b/system-test/performance-testcases/aws-cpu-only-perf-10-node.yml
@@ -17,4 +17,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: ""
     agents:
-      - "queue=testnet-deploy"
+      - "queue=aws-deploy"
diff --git a/system-test/performance-testcases/aws-cpu-only-perf-5-node.yml b/system-test/performance-testcases/aws-cpu-only-perf-5-node.yml
@@ -17,4 +17,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: ""
     agents:
-      - "queue=testnet-deploy"
+      - "queue=aws-deploy"
diff --git a/system-test/performance-testcases/azure-cpu-only-perf-5-node.yml b/system-test/performance-testcases/azure-cpu-only-perf-5-node.yml
@@ -16,4 +16,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: ""
     agents:
-      - "queue=testnet-deploy"
+      - "queue=azure-deploy"
diff --git a/system-test/performance-testcases/gce-cpu-only-perf-10-node.yml b/system-test/performance-testcases/gce-cpu-only-perf-10-node.yml
@@ -16,4 +16,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: ""
     agents:
-      - "queue=testnet-deploy"
+      - "queue=gce-deploy"
diff --git a/system-test/performance-testcases/gce-cpu-only-perf-5-node.yml b/system-test/performance-testcases/gce-cpu-only-perf-5-node.yml
@@ -16,4 +16,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: "--dedicated"
     agents:
-      - "queue=testnet-deploy"
+      - "queue=gce-deploy"
diff --git a/system-test/performance-testcases/gce-gpu-perf-10-node.yml b/system-test/performance-testcases/gce-gpu-perf-10-node.yml
@@ -16,4 +16,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: "--dedicated"
     agents:
-      - "queue=testnet-deploy"
+      - "queue=gce-deploy"
diff --git a/system-test/performance-testcases/gce-gpu-perf-100-node.yml b/system-test/performance-testcases/gce-gpu-perf-100-node.yml
@@ -17,4 +17,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: "--dedicated"
     agents:
-      - "queue=testnet-deploy"
+      - "queue=gce-deploy"
diff --git a/system-test/performance-testcases/gce-gpu-perf-25-node.yml b/system-test/performance-testcases/gce-gpu-perf-25-node.yml
@@ -16,4 +16,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: "--dedicated"
     agents:
-      - "queue=testnet-deploy"
+      - "queue=gce-deploy"
diff --git a/system-test/performance-testcases/gce-gpu-perf-5-node.yml b/system-test/performance-testcases/gce-gpu-perf-5-node.yml
@@ -16,4 +16,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: "--dedicated"
     agents:
-      - "queue=testnet-deploy"
+      - "queue=gce-deploy"
diff --git a/system-test/performance-testcases/gce-gpu-perf-50-node.yml b/system-test/performance-testcases/gce-gpu-perf-50-node.yml
@@ -17,4 +17,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: "--dedicated"
     agents:
-      - "queue=testnet-deploy"
+      - "queue=gce-deploy"
diff --git a/system-test/stability-testcases/gce-stability-5-node.yml b/system-test/stability-testcases/gce-stability-5-node.yml
@@ -15,4 +15,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: "--dedicated"
     agents:
-      - "queue=testnet-deploy"
+      - "queue=stability-deploy"
diff --git a/system-test/testnet-automation.sh b/system-test/testnet-automation.sh
@@ -87,63 +87,8 @@ $(eval echo "$@")"
   )
 
   execution_step "Deleting Testnet"
-  case $CLOUD_PROVIDER in
-  gce)
-  (
-    cat <<EOF
-- wait: ~
-  continue_on_failure: true
-
-- command: "net/gce.sh delete -p ${TESTNET_TAG}"
-  label: "Delete Testnet"
-  agents:
-    - "queue=testnet-deploy"
-EOF
-  ) | buildkite-agent pipeline upload
-  ;;
-  ec2)
-  (
-    cat <<EOF
-- wait: ~
-  continue_on_failure: true
-
-- command: "net/ec2.sh delete -p ${TESTNET_TAG}"
-  label: "Delete Testnet"
-  agents:
-    - "queue=testnet-deploy"
-EOF
-  ) | buildkite-agent pipeline upload
-  ;;
-  azure)
-  (
-    cat <<EOF
-- wait: ~
-  continue_on_failure: true
-
-- command: "net/azure.sh delete -p ${TESTNET_TAG}"
-  label: "Delete Testnet"
-  agents:
-    - "queue=testnet-deploy"
-EOF
-  ) | buildkite-agent pipeline upload
-  ;;
-  colo)
-    (
-    cat <<EOF
-- wait: ~
-  continue_on_failure: true
-
-- command: "net/colo.sh delete -p ${TESTNET_TAG}"
-  label: "Delete Testnet"
-  agents:
-    - "queue=colo-deploy"
-EOF
-  ) | buildkite-agent pipeline upload
-  ;;
-  *)
-    echo "Error: Unsupported cloud provider: $CLOUD_PROVIDER"
-    ;;
-  esac
+  net/"${CLOUD_PROVIDER}".sh delete -p "${TESTNET_TAG}"
+
 }
 trap 'cleanup_testnet $BASH_COMMAND' EXIT