From 00d74bc7425d213619ce020be29eec83be8dd163 Mon Sep 17 00:00:00 2001
From: Ben Napolitan <bennapol@amazon.com>
Date: Mon, 15 Jun 2020 11:36:03 -0400
Subject: [PATCH] Run scale tests moved and hidden behind env var.

---
 scripts/lib/common.sh            |  6 ++++++
 scripts/run-integration-tests.sh | 20 ++++++--------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/scripts/lib/common.sh b/scripts/lib/common.sh
index 04ab4eec96..5ea7c69248 100644
--- a/scripts/lib/common.sh
+++ b/scripts/lib/common.sh
@@ -30,6 +30,9 @@ function display_timelines() {
 }
 
 function run_scale_test_130_pods() {
+    echo "Running scale tests against cluster"
+    DEPLOY_START=$SECONDS
+
     SCALE_UP_DURATION_ARRAY=()
     SCALE_DOWN_DURATION_ARRAY=()
     while [ ${#SCALE_UP_DURATION_ARRAY[@]} -lt 3 ]
@@ -71,4 +74,7 @@ function run_scale_test_130_pods() {
         echo "${SCALE_DOWN_DURATION_ARRAY[$INDEX]} seconds"
         INDEX=$((INDEX + 1))
     done
+    echo ""
+    DEPLOY_DURATION=$((SECONDS - DEPLOY_START))
+    echo "TIMELINE: 130 Pod scale test took $DEPLOY_DURATION seconds."
 }
diff --git a/scripts/run-integration-tests.sh b/scripts/run-integration-tests.sh
index 4063d9f721..cf813750fa 100755
--- a/scripts/run-integration-tests.sh
+++ b/scripts/run-integration-tests.sh
@@ -162,20 +162,6 @@ echo "TESTING downloading eksctl"
 curl --silent --location "https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp
 sudo mv -v /tmp/eksctl /usr/local/bin
 
-aws sts get-caller-identity
-
-eksctl get clusters
-
-echo "TESTING trying to put 20 pods on new nodegroup"
-DEPLOY_START=$SECONDS
-
-$KUBECTL_PATH apply -f deploy-130-pods.yaml
-run_scale_test_130_pods
-$KUBECTL_PATH delete -f deploy-130-pods.yaml
-
-DEPLOY_DURATION=$((SECONDS - DEPLOY_START))
-echo "TIMELINE: Current image integration tests took $DEPLOY_DURATION seconds."
-
 echo "*******************************************************************************"
 echo "Running integration tests on default CNI version, $ADDONS_CNI_IMAGE"
 echo ""
@@ -229,6 +215,12 @@ if [[ $TEST_PASS -eq 0 && "$RUN_CONFORMANCE" == true ]]; then
   echo "TIMELINE: Conformance tests took $CONFORMANCE_DURATION seconds."
 fi
 
+if [ "$RUN_SCALE_TESTS" == true ]
+    $KUBECTL_PATH apply -f deploy-130-pods.yaml
+    run_scale_test_130_pods
+    $KUBECTL_PATH delete -f deploy-130-pods.yaml
+fi
+
 if [[ "$DEPROVISION" == true ]]; then
     START=$SECONDS