Merge pull request #1635 from njhale/fix-always-cleanup-e2e

test(e2e): delete all subs, installplans, catalogs, and csvs in test teardown

Author: openshift-merge-robot

test/e2e/bundle_e2e_test.go

@@ -11,7 +11,6 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/dynamic"
@@ -38,7 +37,7 @@ var _ = PDescribe("Installing bundles with new object types", func() {
 	})
 
 	AfterEach(func() {
-		cleaner.NotifyTestComplete(true)
+		TearDown(testNamespace)
 	})
 
 	When("a bundle with a pdb, priorityclass, and VPA object is installed", func() {

test/e2e/catalog_e2e_test.go

@@ -31,10 +31,11 @@ import (
 )
 
 var _ = Describe("Catalog", func() {
-	It("loading between restarts", func() {
-
-		defer cleaner.NotifyTestComplete(true)
+	AfterEach(func() {
+		TearDown(testNamespace)
+	})
 
+	It("loading between restarts", func() {
 		// create a simple catalogsource
 		packageName := genName("nginx")
 		stableChannel := "stable"
@@ -90,8 +91,6 @@ var _ = Describe("Catalog", func() {
 	})
 	It("global update triggers subscription sync", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		globalNS := operatorNamespace
 		c := newKubeClient()
 		crc := newCRClient()
@@ -199,8 +198,6 @@ var _ = Describe("Catalog", func() {
 	})
 	It("config map update triggers registry pod rollout", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		mainPackageName := genName("nginx-")
 		dependentPackageName := genName("nginxdep-")
 
@@ -318,8 +315,6 @@ var _ = Describe("Catalog", func() {
 	})
 	It("config map replace triggers registry pod rollout", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		mainPackageName := genName("nginx-")
 		dependentPackageName := genName("nginxdep-")
 
@@ -408,8 +403,6 @@ var _ = Describe("Catalog", func() {
 		// Update the "address" CatalogSources's Spec.Address field with the PodIP of the replacement copied pod's PodIP
 		// Wait for the replacement CSV to be Successful
 
-		defer cleaner.NotifyTestComplete(true)
-
 		mainPackageName := genName("nginx-")
 		dependentPackageName := genName("nginxdep-")
 
@@ -545,8 +538,6 @@ var _ = Describe("Catalog", func() {
 		// Delete the registry pod
 		// Wait for a new registry pod to be created
 
-		defer cleaner.NotifyTestComplete(true)
-
 		// Create internal CatalogSource containing csv in package
 		packageName := genName("nginx-")
 		packageStable := fmt.Sprintf("%s-stable", packageName)
@@ -630,8 +621,6 @@ var _ = Describe("Catalog", func() {
 		// Delete the registry pod
 		// Wait for a new registry pod to be created
 
-		defer cleaner.NotifyTestComplete(true)
-
 		sourceName := genName("catalog-")
 		packageName := "etcd"
 		channelName := "clusterwide-alpha"
@@ -781,7 +770,6 @@ var _ = Describe("Catalog", func() {
 		}
 
 		// 2. setup catalog source
-		defer cleaner.NotifyTestComplete(true)
 
 		sourceName := genName("catalog-")
 		packageName := "busybox"
@@ -952,7 +940,6 @@ var _ = Describe("Catalog", func() {
 		// Update the catalog to point to an image that contains the busybox v2 and busybox-dependency v2 images.
 		// Wait for the new Subscriptions to succeed and check if they include the new CSVs
 		// Wait for the CSVs to succeed and confirm that the have the correct Spec.Replaces fields.
-		defer cleaner.NotifyTestComplete(true)
 
 		sourceName := genName("catalog-")
 		packageName := "busybox"

test/e2e/crd_e2e_test.go

@@ -18,7 +18,7 @@ import (
 )
 
 var _ = Describe("CRD Versions", func() {
-	AfterEach(func() { cleaner.NotifyTestComplete(true) }, float64(10))
+	AfterEach(func() { TearDown(testNamespace) }, float64(30))
 
 	It("creates v1beta1 crds with a v1beta1 schema successfully", func() {
 		By("This test proves that OLM is able to handle v1beta1 CRDs successfully. Creating v1 CRDs has more " +

test/e2e/csv_e2e_test.go

@@ -34,9 +34,11 @@ import (
 )
 
 var _ = Describe("CSV", func() {
-	It("create with unmet requirements mini kube version", func() {
+	AfterEach(func() {
+		TearDown(testNamespace)
+	})
 
-		defer cleaner.NotifyTestComplete(true)
+	It("create with unmet requirements mini kube version", func() {
 
 		c := newKubeClient()
 		crc := newCRClient()
@@ -88,8 +90,6 @@ var _ = Describe("CSV", func() {
 	// TODO: same test but missing serviceaccount instead
 	It("create with unmet requirements CRD", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 		crc := newCRClient()
 
@@ -150,8 +150,6 @@ var _ = Describe("CSV", func() {
 	})
 	It("create with unmet permissions CRD", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 		crc := newCRClient()
 
@@ -260,8 +258,6 @@ var _ = Describe("CSV", func() {
 	})
 	It("create with unmet requirements API service", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 		crc := newCRClient()
 
@@ -322,8 +318,6 @@ var _ = Describe("CSV", func() {
 	})
 	It("create with unmet permissions API service", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 		crc := newCRClient()
 
@@ -412,8 +406,6 @@ var _ = Describe("CSV", func() {
 	})
 	It("create with unmet requirements native API", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 		crc := newCRClient()
 
@@ -465,8 +457,6 @@ var _ = Describe("CSV", func() {
 	// TODO: same test but create serviceaccount instead
 	It("create requirements met CRD", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 		crc := newCRClient()
 
@@ -727,8 +717,6 @@ var _ = Describe("CSV", func() {
 	})
 	It("create requirements met API service", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 		crc := newCRClient()
 
@@ -890,8 +878,6 @@ var _ = Describe("CSV", func() {
 	})
 	It("create with owned API service", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 		crc := newCRClient()
 
@@ -1081,8 +1067,6 @@ var _ = Describe("CSV", func() {
 	})
 	It("update with owned API service", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 		crc := newCRClient()
 
@@ -1284,8 +1268,6 @@ var _ = Describe("CSV", func() {
 	})
 	It("create same CSV with owned API service multi namespace", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 		crc := newCRClient()
 
@@ -1489,8 +1471,6 @@ var _ = Describe("CSV", func() {
 	})
 	It("orphaned API service clean up", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 
 		mockGroup := fmt.Sprintf("hats.%s.redhat.com", genName(""))
@@ -1556,8 +1536,6 @@ var _ = Describe("CSV", func() {
 	})
 	It("update same deployment name", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 		crc := newCRClient()
 
@@ -1740,8 +1718,6 @@ var _ = Describe("CSV", func() {
 	})
 	It("update different deployment name", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 		crc := newCRClient()
 
@@ -1922,8 +1898,6 @@ var _ = Describe("CSV", func() {
 	})
 	It("update multiple intermediates", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 		crc := newCRClient()
 
@@ -2110,8 +2084,6 @@ var _ = Describe("CSV", func() {
 	})
 	It("update in place", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 		crc := newCRClient()
 
@@ -2264,8 +2236,6 @@ var _ = Describe("CSV", func() {
 	})
 	It("update multiple version CRD", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 		crc := newCRClient()
 
@@ -2545,8 +2515,6 @@ var _ = Describe("CSV", func() {
 	})
 	It("update modify deployment name", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 		crc := newCRClient()
 
@@ -2697,7 +2665,6 @@ var _ = Describe("CSV", func() {
 	})
 
 	It("emits CSV requirement events", func() {
-		defer cleaner.NotifyTestComplete(true)
 
 		c := ctx.Ctx().KubeClient()
 		crc := ctx.Ctx().OperatorClient()
@@ -2785,8 +2752,6 @@ var _ = Describe("CSV", func() {
 	// TODO: test behavior when replaces field doesn't point to existing CSV
 	It("status invalid CSV", func() {
 
-		defer cleaner.NotifyTestComplete(true)
-
 		c := newKubeClient()
 		crc := newCRClient()
 
@@ -2899,7 +2864,6 @@ var _ = Describe("CSV", func() {
 	})
 
 	It("api service resource migrated if adoptable", func() {
-		defer cleaner.NotifyTestComplete(true)
 
 		c := newKubeClient()
 		crc := newCRClient()
@@ -2983,7 +2947,6 @@ var _ = Describe("CSV", func() {
 	})
 
 	It("API service resource not migrated if not adoptable", func() {
-		defer cleaner.NotifyTestComplete(true)
 
 		c := newKubeClient()
 		crc := newCRClient()
@@ -3070,7 +3033,6 @@ var _ = Describe("CSV", func() {
 	})
 
 	It("multiple API services on a single pod", func() {
-		defer cleaner.NotifyTestComplete(true)
 
 		c := newKubeClient()
 		crc := newCRClient()

test/e2e/ctx/ctx.go

@@ -115,6 +115,7 @@ func setDerivedFields(ctx *TestContext) error {
 
 	ctx.scheme = runtime.NewScheme()
 	localSchemeBuilder := runtime.NewSchemeBuilder(
+		apiextensionsv1.AddToScheme,
 		kscheme.AddToScheme,
 		operatorsv1alpha1.AddToScheme,
 		operatorsv1.AddToScheme,

test/e2e/dynamic_resource_e2e_test.go

@@ -36,7 +36,7 @@ var _ = Describe("Subscriptions create required objects from Catalogs", func() {
 	})
 
 	AfterEach(func() {
-		cleaner.NotifyTestComplete(true)
+		TearDown(testNamespace)
 	})
 
 	Context("Given a Namespace", func() {

test/e2e/e2e_test.go

@@ -69,9 +69,6 @@ var _ = BeforeSuite(func() {
 	testNamespace = *namespace
 	operatorNamespace = *olmNamespace
 	communityOperatorsImage = *communityOperators
-
-	cleaner = newNamespaceCleaner(testNamespace)
-
 	deprovision = ctx.MustProvision(ctx.Ctx())
 	ctx.MustInstall(ctx.Ctx())
 

test/e2e/gc_e2e_test.go

@@ -35,7 +35,7 @@ var _ = Describe("Garbage collection for dependent resources", func() {
 	})
 
 	AfterEach(func() {
-		cleaner.NotifyTestComplete(true)
+		TearDown(testNamespace)
 	})
 
 	Context("Given a ClusterRole owned by a CustomResourceDefinition", func() {