From 39481754271af44eccfb4aaec6a43da339de39bd Mon Sep 17 00:00:00 2001
From: James Munnelly <james@munnelly.eu>
Date: Mon, 29 Apr 2019 21:12:16 +0100
Subject: [PATCH] Fix e2e test addon deprovisioning order

Signed-off-by: James Munnelly <james@munnelly.eu>
---
 test/e2e/framework/framework.go | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go
index 586be45e2..c52bb998f 100644
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -152,6 +152,17 @@ func (f *Framework) AfterEach() {
 
 	f.printAddonLogs()
 
+	if !f.Config.Cleanup {
+		return
+	}
+
+	for i := len(f.requiredAddons) - 1; i >= 0; i-- {
+		a := f.requiredAddons[i]
+		By("De-provisioning test-scoped addon")
+		err := a.Deprovision()
+		Expect(err).NotTo(HaveOccurred())
+	}
+
 	By("Deleting test namespace")
 	err := f.DeleteKubeNamespace(f.Namespace.Name)
 	Expect(err).NotTo(HaveOccurred())
@@ -209,14 +220,6 @@ func (f *Framework) RequireAddon(a addon.Addon) {
 		err = a.Provision()
 		Expect(err).NotTo(HaveOccurred())
 	})
-
-	AfterEach(func() {
-		if !f.Config.Cleanup {
-			return
-		}
-		err := a.Deprovision()
-		Expect(err).NotTo(HaveOccurred())
-	})
 }
 
 func (f *Framework) Helper() *helper.Helper {