Skip to content

OCPQE-31083: Update OwnSingle template to use inline.watchNamespace for QE cases #541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2025
+27 −22
Merged

OCPQE-31083: Update OwnSingle template to use inline.watchNamespace for QE cases #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"isolation": {}
},
"source": "openshift:payload:olmv1",
"lifecycle": "informing",
"lifecycle": "blocking",
Copy link
Contributor

@camilamacedo86 camilamacedo86 Nov 5, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it producing signal to Sippy?
Could we move all tests that will become a blocking to be centralised?

In this case, can we move any QE shaped test to : https://github.com/openshift/operator-framework-operator-controller/blob/main/openshift/tests-extension/test/

Also, are those scenarios that are not covered yet?
It would be great we ensure that we have not many tests covering the same.

Otherwise, it might start be hard for we keep things maintained.

Copy link
Contributor Author

@kuiwang02 kuiwang02 Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is for QE case. it is different with case migrated from origin.

"environmentSelector": {
"exclude": "topology==\"External\""
}
Expand Down Expand Up @@ -40,7 +40,7 @@
"isolation": {}
},
"source": "openshift:payload:olmv1",
"lifecycle": "informing",
"lifecycle": "blocking",
"environmentSelector": {
"exclude": "topology==\"External\""
}
Expand All @@ -55,7 +55,7 @@
"isolation": {}
},
"source": "openshift:payload:olmv1",
"lifecycle": "informing",
"lifecycle": "blocking",
"environmentSelector": {
"exclude": "topology==\"External\""
}
Expand All @@ -71,7 +71,7 @@
"isolation": {}
},
"source": "openshift:payload:olmv1",
"lifecycle": "informing",
"lifecycle": "blocking",
"environmentSelector": {
"exclude": "topology==\"External\""
}
Expand All @@ -87,7 +87,7 @@
"isolation": {}
},
"source": "openshift:payload:olmv1",
"lifecycle": "informing",
"lifecycle": "blocking",
"environmentSelector": {
"exclude": "topology==\"External\""
}
Expand All @@ -102,7 +102,7 @@
"isolation": {}
},
"source": "openshift:payload:olmv1",
"lifecycle": "informing",
"lifecycle": "blocking",
"environmentSelector": {
"exclude": "topology==\"External\""
}
Expand All @@ -117,7 +117,7 @@
"isolation": {}
},
"source": "openshift:payload:olmv1",
"lifecycle": "informing",
"lifecycle": "blocking",
"environmentSelector": {
"exclude": "topology==\"External\""
}
Expand All @@ -132,7 +132,7 @@
"isolation": {}
},
"source": "openshift:payload:olmv1",
"lifecycle": "informing",
"lifecycle": "blocking",
"environmentSelector": {
"exclude": "topology==\"External\""
}
Expand All @@ -147,7 +147,7 @@
"isolation": {}
},
"source": "openshift:payload:olmv1",
"lifecycle": "informing",
"lifecycle": "blocking",
"environmentSelector": {
"exclude": "topology==\"External\""
}
Expand All @@ -162,7 +162,7 @@
"isolation": {}
},
"source": "openshift:payload:olmv1",
"lifecycle": "informing",
"lifecycle": "blocking",
"environmentSelector": {
"exclude": "topology==\"External\""
}
Expand All @@ -177,7 +177,7 @@
"isolation": {}
},
"source": "openshift:payload:olmv1",
"lifecycle": "informing",
"lifecycle": "blocking",
"environmentSelector": {
"exclude": "topology==\"External\""
}
Expand All @@ -192,7 +192,7 @@
"isolation": {}
},
"source": "openshift:payload:olmv1",
"lifecycle": "informing",
"lifecycle": "blocking",
"environmentSelector": {
"exclude": "topology==\"External\""
}
Expand All @@ -207,7 +207,7 @@
"isolation": {}
},
"source": "openshift:payload:olmv1",
"lifecycle": "informing",
"lifecycle": "blocking",
"environmentSelector": {
"exclude": "topology==\"External\""
}
Expand All @@ -222,7 +222,7 @@
"isolation": {}
},
"source": "openshift:payload:olmv1",
"lifecycle": "informing",
"lifecycle": "blocking",
"environmentSelector": {
"exclude": "topology==\"External\""
}
Expand All @@ -237,7 +237,7 @@
"isolation": {}
},
"source": "openshift:payload:olmv1",
"lifecycle": "informing",
"lifecycle": "blocking",
"environmentSelector": {
"exclude": "topology==\"External\""
}
Expand Down
7 changes: 4 additions & 3 deletions openshift/tests-extension/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
// }
Copy link
Contributor

@camilamacedo86 camilamacedo86 Nov 5, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we not merge code commented?

Copy link
Contributor Author

@kuiwang02 kuiwang02 Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will like to keep it because we will monitor it. I will remove it after we approve the QE design in the future.

// Exclude External topology for NonHyperShiftHOST tests
if spec.Labels.Has("NonHyperShiftHOST") {
spec.Exclude(et.TopologyEquals("External"))
Expand Down
6 changes: 4 additions & 2 deletions openshift/tests-extension/pkg/bindata/qe/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions ...ft/tests-extension/test/qe/testdata/olm/clusterextension-withselectorlabel-OwnSingle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down