Skip to content

NO-ISSUE: rebase-release-4.17-4.17.0-0.nightly-2025-12-24-095138_amd64-2025-12-24_arm64-2025-12-24 #5982

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 4 commits into from
Dec 25, 2025
Merged

NO-ISSUE: rebase-release-4.17-4.17.0-0.nightly-2025-12-24-095138_amd64-2025-12-24_arm64-2025-12-24 #5982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f835afa
update last_rebase.sh
Dec 25, 2025
8c72839
update changelog
Dec 25, 2025
ee9b70e
update manifests
Dec 25, 2025
c1281c4
update buildfiles
Dec 25, 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
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.17.0-0.nightly-arm64-2025-12-22-031630
OCP_VERSION := 4.17.0-0.nightly-arm64-2025-12-24-095138
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.17.0-0.nightly-2025-12-21-112352
OCP_VERSION := 4.17.0-0.nightly-2025-12-24-095138
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2025-12-22-031630"
"base": "4.17.0-0.nightly-arm64-2025-12-24-095138"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bcfcf00edd066998cfdec302180b7086e3646ede28fb087ced1e8cc14381a33f",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.17.0-0.nightly-2025-12-21-112352"
"base": "4.17.0-0.nightly-2025-12-24-095138"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eae19aef5814e643d574a49a5728564d602acac8df13ad0d7a7812504a1a62ce",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2025-12-22-031630"
"base": "4.17.0-0.nightly-arm64-2025-12-24-095138"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eae56bb2c2b111f616f21a8c333ac075747f463d4ee751956339dcd7fa445f2e",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.17.0-0.nightly-2025-12-21-112352"
"base": "4.17.0-0.nightly-2025-12-24-095138"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:886bf376cce02112c97f9751b74412ac0f486bce31de44aaf196353fe68420b1",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2025-12-22-031630"
"base": "4.17.0-0.nightly-arm64-2025-12-24-095138"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9969545c69b7d3e183723afe310cd27f5e908e313d389aae4adebbb465c20bfc",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.17.0-0.nightly-2025-12-21-112352"
"base": "4.17.0-0.nightly-2025-12-24-095138"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2199b6d6017c4115fee60778d05cb51a6288604685eb302c375bf12f9178d980",
Expand Down
3 changes: 0 additions & 3 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
- operator-framework-olm embedded-component 12fbe1b70635c5c100a6a5fc5734280a17a95c3d to 52652d0744d7cf955defb84d38f45bfe640d7850
- 3b968a15 2025-12-12T14:17:47+01:00 Fix TOCTOU race condition in ensureInstallPlan (#3682)

2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash -x
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2025-12-21-112352" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2025-12-22-031630"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2025-12-24-095138" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2025-12-24-095138"