UPSTREAM: <carry>: OTE add logs and dumps for olmv1 test and fix helper for clusterextensions

Author: camilamacedo86

openshift/tests-extension/pkg/helpers/dump.go

@@ -105,9 +105,9 @@ func DescribeAllClusterExtensions(ctx context.Context, namespace string) {
 		return
 	}
 
-	for _, n := range names {
-		subHeader("describe %s", n)
-		RunAndPrint(ctx, "describe", "clusterextension", strings.TrimPrefix(n, "clusterextension/"), "-n", namespace)
+	for _, nm := range names {
+		subHeader("describe %s", nm)
+		RunAndPrint(ctx, "describe", nm, "-n", namespace)
 	}
 	fmt.Fprintln(GinkgoWriter)
 }

openshift/tests-extension/test/olmv1-incompatible.go

@@ -37,14 +37,23 @@ import (
 )
 
 var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1 operator installation", func() {
+	var unique, nsName, ccName, rbName, opName string
 	BeforeEach(func() {
 		helpers.RequireOLMv1CapabilityOnOpenshift()
+		unique = rand.String(8)
+		nsName = "install-test-ns-" + unique
+		ccName = "install-test-cc-" + unique
+		rbName = "install-test-rb-" + unique
+		opName = "install-test-op-" + unique
+	})
+
+	AfterEach(func(ctx SpecContext) {
+		if CurrentSpecReport().Failed() {
+			By("dumping for debugging")
+			helpers.DescribeAllClusterCatalogs(context.Background())
+			helpers.DescribeAllClusterExtensions(context.Background(), nsName)
+		}
 	})
-	unique := rand.String(8)
-	nsName := "install-test-ns-" + unique
-	ccName := "install-test-cc-" + unique
-	rbName := "install-test-rb-" + unique
-	opName := "install-test-op-" + unique
 	It("should block cluster upgrades if an incompatible operator is installed", func(ctx SpecContext) {
 		if !env.Get().IsOpenShift {
 			Skip("Requires OCP APIs: not OpenShift")
@@ -316,6 +325,15 @@ func waitForBuildToFinish(ctx SpecContext, name, namespace string) {
 		g.Expect(cond).ToNot(BeNil())
 		g.Expect(cond.Status).To(Equal(corev1.ConditionTrue))
 	}).WithTimeout(5 * time.Minute).WithPolling(1 * time.Second).Should(Succeed())
+
+	DeferCleanup(func() {
+		if CurrentSpecReport().Failed() {
+			if CurrentSpecReport().Failed() {
+				helpers.RunAndPrint(context.Background(), "get", "build", name, "-n", namespace, "-oyaml")
+				helpers.RunAndPrint(context.Background(), "logs", fmt.Sprintf("build/%s", name), "-n", namespace, "--tail=200")
+			}
+		}
+	})
 }
 
 func waitForClusterCatalogServing(ctx context.Context, name string) {

openshift/tests-extension/test/olmv1.go

@@ -76,11 +76,11 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1
 		namespace string
 		k8sClient client.Client
 	)
+
 	BeforeEach(func() {
 		helpers.RequireOLMv1CapabilityOnOpenshift()
 		k8sClient = env.Get().K8sClient
 		namespace = "install-test-ns-" + rand.String(4)
-
 		By(fmt.Sprintf("creating namespace %s", namespace))
 		ns := &corev1.Namespace{
 			ObjectMeta: metav1.ObjectMeta{
@@ -89,10 +89,19 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1
 		}
 		Expect(k8sClient.Create(context.Background(), ns)).To(Succeed(), "failed to create test namespace")
 		DeferCleanup(func() {
+			By(fmt.Sprintf("deleting namespace %s", namespace))
 			_ = k8sClient.Delete(context.Background(), ns)
 		})
 	})
 
+	AfterEach(func(ctx SpecContext) {
+		if CurrentSpecReport().Failed() {
+			By("dumping for debugging")
+			helpers.DescribeAllClusterCatalogs(context.Background())
+			helpers.DescribeAllClusterExtensions(context.Background(), namespace)
+		}
+	})
+
 	It("should install a cluster extension", func(ctx SpecContext) {
 		if !env.Get().IsOpenShift {
 			Skip("Requires OCP Catalogs: not OpenShift")