From 5bab04d97fd9507a67bfd274dc3746ed3fc3d5f9 Mon Sep 17 00:00:00 2001
From: Ben Napolitan <bnapolitan@outlook.com>
Date: Wed, 1 Jul 2020 02:43:28 -0400
Subject: [PATCH] Changes from PR.

---
 scripts/run-integration-tests.sh              | 12 +++++------
 test/integration/README.md                    | 20 +++++++++----------
 .../deploy-130-pods.yaml                      |  2 +-
 .../deploy-5000-pods.yaml                     |  2 +-
 .../deploy-730-pods.yaml                      |  2 +-
 5 files changed, 18 insertions(+), 20 deletions(-)
 rename deploy-130-pods.yaml => testdata/deploy-130-pods.yaml (90%)
 rename deploy-5000-pods.yaml => testdata/deploy-5000-pods.yaml (90%)
 rename deploy-730-pods.yaml => testdata/deploy-730-pods.yaml (90%)

diff --git a/scripts/run-integration-tests.sh b/scripts/run-integration-tests.sh
index d593cab10b6..de70c005c1a 100755
--- a/scripts/run-integration-tests.sh
+++ b/scripts/run-integration-tests.sh
@@ -218,17 +218,17 @@ fi
 
 if [[ "$RUN_PERFORMANCE_TESTS" == true ]]; then
     START=$SECONDS
-    $KUBECTL_PATH apply -f deploy-130-pods.yaml
+    $KUBECTL_PATH apply -f ./testdata/deploy-130-pods.yaml
     run_performance_test_130_pods
-    $KUBECTL_PATH delete -f deploy-130-pods.yaml
+    $KUBECTL_PATH delete -f ./testdata/deploy-130-pods.yaml
 
-    $KUBECTL_PATH apply -f deploy-730-pods.yaml
+    $KUBECTL_PATH apply -f ./testdata/deploy-730-pods.yaml
     run_performance_test_730_pods
-    $KUBECTL_PATH delete -f deploy-730-pods.yaml
+    $KUBECTL_PATH delete -f ./testdata/deploy-730-pods.yaml
 
-    $KUBECTL_PATH apply -f deploy-5000-pods.yaml
+    $KUBECTL_PATH apply -f ./testdata/deploy-5000-pods.yaml
     run_performance_test_5000_pods
-    $KUBECTL_PATH delete -f deploy-5000-pods.yaml
+    $KUBECTL_PATH delete -f ./testdata/deploy-5000-pods.yaml
     PERFORMANCE_DURATION=$((SECONDS - START))
 fi
 
diff --git a/test/integration/README.md b/test/integration/README.md
index f8a87247f87..c2e4f778cb1 100644
--- a/test/integration/README.md
+++ b/test/integration/README.md
@@ -1,6 +1,4 @@
-## Conformance test duration log
-
-Design document link - https://quip-amazon.com/BoJLAC3IpIfW 
+## Conformance test duration log 
 
 * May 20, 2020: Initial integration step took roughly 3h 41min
 * May 27: 3h 1min
@@ -14,21 +12,21 @@ Design document link - https://quip-amazon.com/BoJLAC3IpIfW
 * May 29: 2h 59min 30s
     * Cache dependencies when testing default CNI
     * Timelines:
-        * Docker build: 3.583 min
-        * Up test cluster: 31.4 min
+        * Docker build: 4 min
+        * Up test cluster: 31 min
         * Default CNI: 50s
         * Updating CNI image: 92s
         * Current image integration: 17s
-        * Conformance tests: 113.8 min (1.9 hrs)
-        * Down cluster: 30.417 min
+        * Conformance tests: 114 min (1.9 hrs)
+        * Down cluster: 30 min
 * June 5: 1h 24min 9s
     * Parallel execution of conformance tests
     * Timelines:
-        * Docker build: 3.617 min
-        * Up test cluster: 31.3 min
+        * Docker build: 3 min
+        * Up test cluster: 31 min
         * Default CNI: 52s
         * Updating CNI image: 92s
         * Current image integration: 18s
-        * Conformance tests: 16.317 min
-        * Down cluster: 29.95 min
+        * Conformance tests: 16 min
+        * Down cluster: 30 min
 
diff --git a/deploy-130-pods.yaml b/testdata/deploy-130-pods.yaml
similarity index 90%
rename from deploy-130-pods.yaml
rename to testdata/deploy-130-pods.yaml
index 895d72ee9cc..20d67541274 100644
--- a/deploy-130-pods.yaml
+++ b/testdata/deploy-130-pods.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: hello
-          image: "gcr.io/google-samples/hello-go-gke:1.0"
+          image: nginx:1.16.1-alpine
           ports:
             - name: http
               containerPort: 80
diff --git a/deploy-5000-pods.yaml b/testdata/deploy-5000-pods.yaml
similarity index 90%
rename from deploy-5000-pods.yaml
rename to testdata/deploy-5000-pods.yaml
index 5390612a083..a130b1b1945 100644
--- a/deploy-5000-pods.yaml
+++ b/testdata/deploy-5000-pods.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: hello
-          image: "gcr.io/google-samples/hello-go-gke:1.0"
+          image: nginx:1.16.1-alpine
           ports:
             - name: http
               containerPort: 80
diff --git a/deploy-730-pods.yaml b/testdata/deploy-730-pods.yaml
similarity index 90%
rename from deploy-730-pods.yaml
rename to testdata/deploy-730-pods.yaml
index 362b01764ca..b15b0df1ed6 100644
--- a/deploy-730-pods.yaml
+++ b/testdata/deploy-730-pods.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: hello
-          image: "gcr.io/google-samples/hello-go-gke:1.0"
+          image: nginx:1.16.1-alpine
           ports:
             - name: http
               containerPort: 80