Skip to content

NO-ISSUE: Synchronize From Upstream Repositories #572

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
openshift-merge-bot merged 29 commits into from
Dec 3, 2025
Merged

NO-ISSUE: Synchronize From Upstream Repositories #572

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
4e349e6
:seedling: Use Patch instead of Update for finalizer operations (#2328)
tmshort Dec 2, 2025
3aa6b80
Merge branch 'main' into synchronize
Dec 3, 2025
ff3a602
UPSTREAM: <carry>: Add OpenShift specific files
dtfranz Oct 26, 2023
1ae80a9
UPSTREAM: <carry>: Add new tests for single/own namespaces install modes
camilamacedo86 Oct 6, 2025
557c855
UPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
camilamacedo86 Oct 13, 2025
4f47e85
UPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp …
camilamacedo86 Oct 13, 2025
b6c47fe
UPSTREAM: <carry>: Update OCP catalogs to v4.21
tmshort Oct 13, 2025
77ec46b
UPSTREAM: <carry>: support singleown cases in disconnected
kuiwang02 Oct 16, 2025
2795af4
UPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
kuiwang02 Oct 17, 2025
e1e7467
UPSTREAM: <carry>: Define Default timeouts and apply their usage accr…
camilamacedo86 Oct 22, 2025
8a6a17f
UPSTREAM: <carry>: Update to new feature-gate options in helm
tmshort Oct 22, 2025
6c63a09
UPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniq…
camilamacedo86 Oct 22, 2025
3c5986d
UPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comme…
camilamacedo86 Oct 24, 2025
4abcc5a
UPSTREAM: <carry>: Update OwnSingle template to use spec.config.inlin…
kuiwang02 Nov 3, 2025
cf247ca
UPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension…
camilamacedo86 Nov 4, 2025
f1e6311
UPSTREAM: <carry>: Add [OTP] to migrated cases
kuiwang02 Nov 7, 2025
511e116
UPSTREAM: <carry>: [OTE]: Upgrade dependencies used
camilamacedo86 Nov 5, 2025
429524c
UPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version…
camilamacedo86 Nov 10, 2025
f1ac82a
UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and depe…
camilamacedo86 Nov 11, 2025
c591a3f
UPSTREAM: <carry>: add disconnected environment support with custom p…
kuiwang02 Nov 12, 2025
3fdfa64
UPSTREAM: <carry>: migrate jiazha test cases to OTE
jianzhangbjz Nov 14, 2025
24361f7
UPSTREAM: <carry>: migrate clustercatalog case to ote
Xia-Zhao-rh Oct 17, 2025
058414c
UPSTREAM: <carry>: migrate olmv1 QE stress cases
kuiwang02 Nov 20, 2025
8c4b315
UPSTREAM: <carry>: Use busybox/httpd to simulate probes
tmshort Nov 25, 2025
07681af
UPSTREAM: <carry>: migrate olmv1 QE cases
Xia-Zhao-rh Nov 25, 2025
26a023c
UPSTREAM: <carry>: add agent for olmv1 qe cases
kuiwang02 Oct 21, 2025
e8795a4
UPSTREAM: <drop>: go mod vendor
Dec 3, 2025
3b6bcf9
UPSTREAM: <drop>: remove upstream GitHub configuration
Dec 3, 2025
ca1c967
UPSTREAM: <drop>: configure the commit-checker
Dec 3, 2025
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
Prev Previous commit
Next Next commit
UPSTREAM: <carry>: Update OwnSingle template to use spec.config.inlin… 
…e.watchNamespace
  • Loading branch information
@kuiwang02
kuiwang02 authored and ci-robot committed Dec 3, 2025
commit 4abcc5aeea4ae6cebb575818b47ccd45d85170ce
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",
"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"
// }
// 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