test: Don't delete and redeploy Cilium at end of each test context

There is no point in doing this. Each test context will deploy Cilium in BeforeAll() with the required configuration. Signed-off-by: Thomas Graf <thomas@cilium.io>
cilium · May 20, 2020 · 17c4f9b · 17c4f9b
1 parent a1d54e3
commit 17c4f9b
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 34 deletions.
diff --git a/test/k8sT/Chaos.go b/test/k8sT/Chaos.go
@@ -51,8 +51,6 @@ var _ = Describe("K8sChaosTest", func() {
 	})
 
 	AfterAll(func() {
-		kubectl.DeleteCiliumDS()
-		ExpectAllPodsTerminated(kubectl)
 		kubectl.CloseSSHClient()
 	})
 

diff --git a/test/k8sT/Conformance.go b/test/k8sT/Conformance.go
@@ -34,7 +34,6 @@ var _ = Describe("K8sConformance", func() {
 
 	AfterEach(func() {
 		kubectl.Delete(connectivityCheckYaml)
-		kubectl.DeleteCiliumDS()
 		ExpectAllPodsTerminated(kubectl)
 	})
 
@@ -44,7 +43,6 @@ var _ = Describe("K8sConformance", func() {
 	})
 
 	AfterAll(func() {
-		DeployCiliumAndDNS(kubectl, ciliumFilename)
 		kubectl.CloseSSHClient()
 	})
 

diff --git a/test/k8sT/DatapathConfiguration.go b/test/k8sT/DatapathConfiguration.go
@@ -45,8 +45,6 @@ var _ = Describe("K8sDatapathConfig", func() {
 
 	AfterEach(func() {
 		deploymentManager.DeleteAll()
-		// FIXME(tgraf) Is this really needed?
-		deploymentManager.DeleteCilium()
 	})
 
 	AfterFailed(func() {
@@ -56,7 +54,6 @@ var _ = Describe("K8sDatapathConfig", func() {
 	})
 
 	AfterAll(func() {
-		DeployCiliumAndDNS(kubectl, helpers.TimestampFilename("cilium.yaml"))
 		kubectl.CloseSSHClient()
 	})
 

diff --git a/test/k8sT/Health.go b/test/k8sT/Health.go
@@ -51,8 +51,6 @@ var _ = Describe("K8sHealthTest", func() {
 	})
 
 	AfterAll(func() {
-		kubectl.DeleteCiliumDS()
-		ExpectAllPodsTerminated(kubectl)
 		kubectl.CloseSSHClient()
 	})
 

diff --git a/test/k8sT/Identity.go b/test/k8sT/Identity.go
@@ -32,18 +32,12 @@ var _ = Describe("K8sIdentity", func() {
 		ciliumFilename = helpers.TimestampFilename("cilium.yaml")
 	})
 
-	AfterEach(func() {
-		kubectl.DeleteCiliumDS()
-		ExpectAllPodsTerminated(kubectl)
-	})
-
 	AfterFailed(func() {
 		kubectl.CiliumReport(helpers.CiliumNamespace,
 			"cilium endpoint list")
 	})
 
 	AfterAll(func() {
-		DeployCiliumAndDNS(kubectl, ciliumFilename)
 		kubectl.CloseSSHClient()
 	})
 

diff --git a/test/k8sT/KafkaPolicies.go b/test/k8sT/KafkaPolicies.go
@@ -62,8 +62,6 @@ var _ = Describe("K8sKafkaPolicyTest", func() {
 	})
 
 	AfterAll(func() {
-		kubectl.DeleteCiliumDS()
-		ExpectAllPodsTerminated(kubectl)
 		kubectl.CloseSSHClient()
 	})
 

diff --git a/test/k8sT/Policies.go b/test/k8sT/Policies.go
@@ -113,8 +113,6 @@ var _ = Describe("K8sPolicyTest", func() {
 	})
 
 	AfterAll(func() {
-		kubectl.DeleteCiliumDS()
-		ExpectAllPodsTerminated(kubectl)
 		kubectl.CloseSSHClient()
 	})
 

diff --git a/test/k8sT/Services.go b/test/k8sT/Services.go
@@ -88,8 +88,6 @@ var _ = Describe("K8sServicesTest", func() {
 	})
 
 	AfterAll(func() {
-		kubectl.DeleteCiliumDS()
-		ExpectAllPodsTerminated(kubectl)
 		kubectl.CloseSSHClient()
 	})
 
@@ -1084,10 +1082,6 @@ var _ = Describe("K8sServicesTest", func() {
 
 				AfterAll(func() {
 					enableBackgroundReport = true
-					kubectl.DeleteCiliumDS()
-					ExpectAllPodsTerminated(kubectl)
-					// Deploy Cilium as the next test expects it to be up and running
-					DeployCiliumAndDNS(kubectl, ciliumFilename)
 				})
 
 				Context("Tests with vxlan", func() {

diff --git a/test/k8sT/demos.go b/test/k8sT/demos.go
@@ -82,8 +82,6 @@ var _ = Describe("K8sDemosTest", func() {
 	})
 
 	AfterAll(func() {
-		kubectl.DeleteCiliumDS()
-		ExpectAllPodsTerminated(kubectl)
 		kubectl.CloseSSHClient()
 	})
 

diff --git a/test/k8sT/external_ips.go b/test/k8sT/external_ips.go
@@ -185,8 +185,6 @@ var _ = Describe("K8sKubeProxyFreeMatrix tests", func() {
 			return
 		}
 		_ = kubectl.NamespaceDelete(namespaceTest)
-		kubectl.DeleteCiliumDS()
-		ExpectAllPodsTerminated(kubectl)
 		kubectl.CloseSSHClient()
 	})
 

diff --git a/test/k8sT/fqdn.go b/test/k8sT/fqdn.go
@@ -90,7 +90,6 @@ var _ = Describe("K8sFQDNTest", func() {
 
 	AfterAll(func() {
 		_ = kubectl.Delete(demoManifest)
-		kubectl.DeleteCiliumDS()
 		ExpectAllPodsTerminated(kubectl)
 		kubectl.CloseSSHClient()
 	})

diff --git a/test/k8sT/hubble.go b/test/k8sT/hubble.go
@@ -112,8 +112,6 @@ var _ = Describe("K8sHubbleTest", func() {
 	})
 
 	AfterAll(func() {
-		kubectl.Delete(ciliumFilename)
-		ExpectAllPodsTerminated(kubectl)
 		kubectl.CloseSSHClient()
 	})
 

diff --git a/test/k8sT/istio.go b/test/k8sT/istio.go
@@ -111,8 +111,6 @@ var _ = Describe("K8sIstioTest", func() {
 		By("Deleting the istio-system namespace")
 		_ = kubectl.NamespaceDelete(istioSystemNamespace)
 
-		kubectl.DeleteCiliumDS()
-
 		kubectl.CloseSSHClient()
 	})