Skip to content

NO-ISSUE: rebase-release-4.17-4.17.0-0.nightly-2025-03-19-173101_amd64-2025-03-19_arm64-2025-03-19 #4707

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
Mar 20, 2025
Merged

NO-ISSUE: rebase-release-4.17-4.17.0-0.nightly-2025-03-19-173101_amd64-2025-03-19_arm64-2025-03-19 #4707

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
8b72229
update last_rebase.sh
Mar 20, 2025
c40941e
update changelog
Mar 20, 2025
98255b5
update manifests
Mar 20, 2025
528b3b3
update buildfiles
Mar 20, 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-03-15-030425
OCP_VERSION := 4.17.0-0.nightly-arm64-2025-03-19-231421
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-03-14-231808
OCP_VERSION := 4.17.0-0.nightly-2025-03-19-173101
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-03-15-030425"
"base": "4.17.0-0.nightly-arm64-2025-03-19-231421"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2defa4fa8fc977cf7e50d921943c8796f3dce108b6f1b738eb34e16ca93a4a3",
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-03-14-231808"
"base": "4.17.0-0.nightly-2025-03-19-173101"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22a1d782360bb420ec5283a2fc5b0f978cb5924a507d2bab626915c106e84f3b",
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-03-15-030425"
"base": "4.17.0-0.nightly-arm64-2025-03-19-231421"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d5efea6ef9ef84ae7859dfe3cf86fa39d38bf8a1e3abbd24e7d6d3d6d9c35252",
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-03-14-231808"
"base": "4.17.0-0.nightly-2025-03-19-173101"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4eae3c778d787f7d20cf8cc65f4806d71023ea2df34943cd4323ff8552c63cc",
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-03-15-030425"
"base": "4.17.0-0.nightly-arm64-2025-03-19-231421"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df643d9def05cf87845ef45e15ca4b34288ef45755bf016ab304c4da4f873131",
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-03-14-231808"
"base": "4.17.0-0.nightly-2025-03-19-173101"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f4d0e09d0be74800fd086780415834b77bfcf9b04b94c71497d81d4defdd7c7",
Expand Down
11 changes: 3 additions & 8 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
- cluster-network-operator embedded-component 58ddfcfac19f71930ccb55614f40fe7f8dbc5b05 to 8f0b637e09e55c50a06ffd0c1db812ed09b5ad3c
- 323704a 2025-02-27T20:04:44+02:00 ovn-k, units-test: Test OVN Kubernetes rendering
- a4ece26 2025-02-27T19:58:21+02:00 ovn-k,rbac: Enable non-admin users create & modify UDN CRs
- 93fa2a9 2025-02-27T19:58:21+02:00 ovn-k,rbac: Add UDN to cluster-reader

- machine-config-operator embedded-component 0f85e35a0b9f7342907597e74e20dfc9fa30ee67 to a2af041b7eb58071d034090e0b451b51177a147f
- ef6f57ea 2025-03-04T16:50:20+00:00 OCPBUGS-48566: Enable nmstate-configuration on all platforms
- f13a830a 2025-02-18T17:22:51+00:00 daemon: add nil check for annotation fetching
- machine-config-operator embedded-component a2af041b7eb58071d034090e0b451b51177a147f to e22d6adfdffb9ee3af2b5518910c22e231306a25
- e472fcdc 2025-03-18T00:12:57+00:00 daemon: ensure ostree-finalize-staged is started before rebooting
- 4d44c277 2025-02-28T01:18:04+00:00 Enforce VIPs to be collocated at the same host

2 changes: 1 addition & 1 deletion scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ https://github.com/openshift/csi-external-snapshotter embedded-component aa558ca
https://github.com/openshift/etcd embedded-component 23c5a247c3e601f7806a0bbffdc6d201a55bf469
https://github.com/openshift/kubernetes embedded-component 98fe56995ed880a36943adc615688f2f5bd1a2d3
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 34fafc04e5f2872e282617da31175a7e091ffdb2
https://github.com/openshift/machine-config-operator embedded-component a2af041b7eb58071d034090e0b451b51177a147f
https://github.com/openshift/machine-config-operator embedded-component e22d6adfdffb9ee3af2b5518910c22e231306a25
https://github.com/openshift/openshift-controller-manager embedded-component 70aa014585cd33fc21f27ba20a722c71faf3c411
https://github.com/openshift/operator-framework-olm embedded-component e9262fe971f881d6a014be70112b0f4cd5b82921
https://github.com/openshift/route-controller-manager embedded-component a47f6be3676d3eabb864ca339584fe857e1076c5
Expand Down
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-03-14-231808" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2025-03-15-030425"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2025-03-19-173101" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2025-03-19-231421"