Changes from PR.

bnapolitan · Jul 1, 2020 · 5bab04d · 5bab04d
1 parent 72a8608
commit 5bab04d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git 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
@@ -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 → testdata/deploy-130-pods.yaml b/deploy-130-pods.yaml → 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 → testdata/deploy-5000-pods.yaml b/deploy-5000-pods.yaml → 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 → testdata/deploy-730-pods.yaml b/deploy-730-pods.yaml → 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