From 53e7d9a8e77ab13904dcb3c56bf5ceb5c4c915f9 Mon Sep 17 00:00:00 2001 From: Kui Wang Date: Mon, 3 Nov 2025 18:32:53 +0800 Subject: [PATCH] UPSTREAM: : Update OwnSingle template to use spec.config.inline.watchNamespace --- .../openshift_payload_olmv1.json | 30 +++++++++---------- openshift/tests-extension/cmd/main.go | 7 +++-- .../tests-extension/pkg/bindata/qe/bindata.go | 6 ++-- ...extension-withselectorlabel-OwnSingle.yaml | 6 ++-- 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json b/openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json index 1d2cf8fb1..0e8d4a178 100644 --- a/openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json +++ b/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\"" } diff --git a/openshift/tests-extension/cmd/main.go b/openshift/tests-extension/cmd/main.go index f970a2e15..450c7e79e 100644 --- a/openshift/tests-extension/cmd/main.go +++ b/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")) diff --git a/openshift/tests-extension/pkg/bindata/qe/bindata.go b/openshift/tests-extension/pkg/bindata/qe/bindata.go index 751e422e9..d975ed082 100644 --- a/openshift/tests-extension/pkg/bindata/qe/bindata.go +++ b/openshift/tests-extension/pkg/bindata/qe/bindata.go @@ -670,12 +670,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: diff --git a/openshift/tests-extension/test/qe/testdata/olm/clusterextension-withselectorlabel-OwnSingle.yaml b/openshift/tests-extension/test/qe/testdata/olm/clusterextension-withselectorlabel-OwnSingle.yaml index 2569af23b..a786070f4 100644 --- a/openshift/tests-extension/test/qe/testdata/olm/clusterextension-withselectorlabel-OwnSingle.yaml +++ b/openshift/tests-extension/test/qe/testdata/olm/clusterextension-withselectorlabel-OwnSingle.yaml @@ -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: