UPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace

Author: kuiwang02

openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json

@@ -9,7 +9,7 @@
       "isolation": {}
     },
     "source": "openshift:payload:olmv1",
-    "lifecycle": "informing",
+    "lifecycle": "blocking",
     "environmentSelector": {
       "exclude": "topology==\"External\""
     }
@@ -40,7 +40,7 @@
       "isolation": {}
     },
     "source": "openshift:payload:olmv1",
-    "lifecycle": "informing",
+    "lifecycle": "blocking",
     "environmentSelector": {
       "exclude": "topology==\"External\""
     }
@@ -55,7 +55,7 @@
       "isolation": {}
     },
     "source": "openshift:payload:olmv1",
-    "lifecycle": "informing",
+    "lifecycle": "blocking",
     "environmentSelector": {
       "exclude": "topology==\"External\""
     }
@@ -71,7 +71,7 @@
       "isolation": {}
     },
     "source": "openshift:payload:olmv1",
-    "lifecycle": "informing",
+    "lifecycle": "blocking",
     "environmentSelector": {
       "exclude": "topology==\"External\""
     }
@@ -87,7 +87,7 @@
       "isolation": {}
     },
     "source": "openshift:payload:olmv1",
-    "lifecycle": "informing",
+    "lifecycle": "blocking",
     "environmentSelector": {
       "exclude": "topology==\"External\""
     }
@@ -102,7 +102,7 @@
       "isolation": {}
     },
     "source": "openshift:payload:olmv1",
-    "lifecycle": "informing",
+    "lifecycle": "blocking",
     "environmentSelector": {
       "exclude": "topology==\"External\""
     }
@@ -117,7 +117,7 @@
       "isolation": {}
     },
     "source": "openshift:payload:olmv1",
-    "lifecycle": "informing",
+    "lifecycle": "blocking",
     "environmentSelector": {
       "exclude": "topology==\"External\""
     }
@@ -132,7 +132,7 @@
       "isolation": {}
     },
     "source": "openshift:payload:olmv1",
-    "lifecycle": "informing",
+    "lifecycle": "blocking",
     "environmentSelector": {
       "exclude": "topology==\"External\""
     }
@@ -147,7 +147,7 @@
       "isolation": {}
     },
     "source": "openshift:payload:olmv1",
-    "lifecycle": "informing",
+    "lifecycle": "blocking",
     "environmentSelector": {
       "exclude": "topology==\"External\""
     }
@@ -162,7 +162,7 @@
       "isolation": {}
     },
     "source": "openshift:payload:olmv1",
-    "lifecycle": "informing",
+    "lifecycle": "blocking",
     "environmentSelector": {
       "exclude": "topology==\"External\""
     }
@@ -177,7 +177,7 @@
       "isolation": {}
     },
     "source": "openshift:payload:olmv1",
-    "lifecycle": "informing",
+    "lifecycle": "blocking",
     "environmentSelector": {
       "exclude": "topology==\"External\""
     }
@@ -192,7 +192,7 @@
       "isolation": {}
     },
     "source": "openshift:payload:olmv1",
-    "lifecycle": "informing",
+    "lifecycle": "blocking",
     "environmentSelector": {
       "exclude": "topology==\"External\""
     }
@@ -207,7 +207,7 @@
       "isolation": {}
     },
     "source": "openshift:payload:olmv1",
-    "lifecycle": "informing",
+    "lifecycle": "blocking",
     "environmentSelector": {
       "exclude": "topology==\"External\""
     }
@@ -222,7 +222,7 @@
       "isolation": {}
     },
     "source": "openshift:payload:olmv1",
-    "lifecycle": "informing",
+    "lifecycle": "blocking",
     "environmentSelector": {
       "exclude": "topology==\"External\""
     }
@@ -237,7 +237,7 @@
       "isolation": {}
     },
     "source": "openshift:payload:olmv1",
-    "lifecycle": "informing",
+    "lifecycle": "blocking",
     "environmentSelector": {
       "exclude": "topology==\"External\""
     }

openshift/tests-extension/cmd/main.go

@@ -219,9 +219,10 @@ func main() {
 	specs = specs.Walk(func(spec *et.ExtensionTestSpec) {
 		if spec.Labels.Has("Extended") {
 			// Change blocking tests to informing unless marked as ReleaseGate
-			if !spec.Labels.Has("ReleaseGate") && spec.Lifecycle == "blocking" {
-				spec.Lifecycle = "informing"
-			}
+			// QE case becomes better so that we could try it
+			// if !spec.Labels.Has("ReleaseGate") && spec.Lifecycle == "blocking" {
+			// 	spec.Lifecycle = "informing"
+			// }
 			// Exclude External topology for NonHyperShiftHOST tests
 			if spec.Labels.Has("NonHyperShiftHOST") {
 				spec.Exclude(et.TopologyEquals("External"))

openshift/tests-extension/pkg/bindata/qe/bindata.go

@@ -7,12 +7,14 @@ objects:
   kind: ClusterExtension
   metadata:
     name: "${NAME}"
-    annotations:
-      olm.operatorframework.io/watch-namespace: "${WATCHNS}"
   spec:
     namespace: "${INSTALLNAMESPACE}"
     serviceAccount:
       name: "${SANAME}"
+    config:
+      configType: Inline
+      inline:
+        watchNamespace: "${WATCHNS}"
     source:
       sourceType: "${SOURCETYPE}"
       catalog: