From 5cd78bfd40a9915a237e8d90a42f5c410ead1794 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Mon, 9 Mar 2020 10:10:37 +0200
Subject: [PATCH] e2e: Consolidate Kubernetes e2e tests - run both Deployment
 and DaemonSet tests on the same Kubernetes Kind cluster - add cleanup script
 that deletes the test namespace before running the DaemonSet tests - set
 Kubernetes version to 1.17.2

---
 .circleci/config.yml           | 47 ++++++++++++----------------------
 test/e2e-kubernetes-cleanup.sh |  6 +++++
 2 files changed, 23 insertions(+), 30 deletions(-)
 create mode 100755 test/e2e-kubernetes-cleanup.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 48310eb4..8674702a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -72,6 +72,19 @@ jobs:
       - run: github-release-notes -org weaveworks -repo flagger -since-latest-release -include-author > /tmp/release.txt
       - run: test/goreleaser.sh
 
+  e2e-kubernetes-testing:
+    machine: true
+    steps:
+      - checkout
+      - attach_workspace:
+          at: /tmp/bin
+      - run: test/container-build.sh
+      - run: test/e2e-kind.sh v1.17.2
+      - run: test/e2e-kubernetes.sh
+      - run: test/e2e-kubernetes-tests-deployment.sh
+      - run: test/e2e-kubernetes-cleanup.sh
+      - run: test/e2e-kubernetes-tests-daemonset.sh
+
   e2e-istio-testing:
     machine: true
     steps:
@@ -83,28 +96,6 @@ jobs:
       - run: test/e2e-istio.sh
       - run: test/e2e-istio-tests.sh
 
-  e2e-kubernetes-daemonset-testing:
-    machine: true
-    steps:
-      - checkout
-      - attach_workspace:
-          at: /tmp/bin
-      - run: test/container-build.sh
-      - run: test/e2e-kind.sh v1.17.0
-      - run: test/e2e-kubernetes.sh
-      - run: test/e2e-kubernetes-tests-daemonset.sh
-
-  e2e-kubernetes-deployment-testing:
-    machine: true
-    steps:
-      - checkout
-      - attach_workspace:
-          at: /tmp/bin
-      - run: test/container-build.sh
-      - run: test/e2e-kind.sh v1.17.0
-      - run: test/e2e-kubernetes.sh
-      - run: test/e2e-kubernetes-tests-deployment.sh
-
   e2e-gloo-testing:
     machine: true
     steps:
@@ -203,15 +194,12 @@ workflows:
               ignore:
                 - gh-pages
                 - /^user-.*/
+      - e2e-kubernetes-testing:
+          requires:
+            - build-binary
       - e2e-istio-testing:
           requires:
             - build-binary
-      - e2e-kubernetes-daemonset-testing:
-          requires:
-            - build-binary
-      - e2e-kubernetes-deployment-testing:
-          requires:
-            - build-binary
       - e2e-gloo-testing:
           requires:
             - build-binary
@@ -227,9 +215,8 @@ workflows:
       - push-container:
           requires:
             - build-binary
+            - e2e-kubernetes-testing
             - e2e-istio-testing
-            - e2e-kubernetes-daemonset-testing
-            - e2e-kubernetes-deployment-testing
             - e2e-gloo-testing
             - e2e-nginx-testing
             - e2e-linkerd-testing
diff --git a/test/e2e-kubernetes-cleanup.sh b/test/e2e-kubernetes-cleanup.sh
new file mode 100755
index 00000000..b289ac72
--- /dev/null
+++ b/test/e2e-kubernetes-cleanup.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -o errexit
+
+echo '>>> Delete test namespace'
+kubectl delete namespace test --ignore-not-found=true --wait=true