Skip to content

NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2025-12-25-211554_amd64-2025-12-25_arm64-2026-01-04 #6012

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
Jan 5, 2026
Merged

NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2025-12-25-211554_amd64-2025-12-25_arm64-2026-01-04 #6012

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
7b4c233
update last_rebase.sh
Jan 5, 2026
3656271
update changelog
Jan 5, 2026
727fc90
update manifests
Jan 5, 2026
97f35b1
update buildfiles
Jan 5, 2026
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.20.0-0.nightly-arm64-2025-12-25-173637
OCP_VERSION := 4.20.0-0.nightly-arm64-2026-01-04-033324
2 changes: 1 addition & 1 deletion assets/components/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.20.0-0.nightly-arm64-2025-12-25-173637"
"base": "4.20.0-0.nightly-arm64-2026-01-04-033324"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:100ef0ea7179766e8cc5b6f47057cf6be91444e3acf4de660b368a557094adbc",
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.20.0-0.nightly-arm64-2025-12-25-173637"
"base": "4.20.0-0.nightly-arm64-2026-01-04-033324"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5524e3e70c93990a349032f3e79a9918bddbdda74a0e0579badb1670e9dbe4cc",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"release": {
"base": "4.20.0-0.nightly-arm64-2025-12-25-173637"
"base": "4.20.0-0.nightly-arm64-2026-01-04-033324"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf14e507e9a04f16b3c721a20777a47fab2c95d704acace19c7fb99b5ba927e6",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2fc1e17d687493bb1bfae5efcb6295ea5d2c5abd1cb9fe2800d230c6a5ac738f",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1bf383810406510fa8a9fa86c5e18d3fff550cd887ba6d2f6f58abcde7286601",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d5ef03e7e1df03e0181ea64a49d0abdc99defd12f22e62bb5cee6a918a223908",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f691875aa7339e11aa0f36f9953cb943ce87418515c4232648c986fb7c31bb3",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d5d615ea52529209fc4c57ad31281a1d451feb9245cdce3cfe183a16321d42f",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:396160a26a5b5447c09b38835b312a3a6d7023dc9794200e03dc8158228b994f",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce1ea777310e552fdc4628c1a5c1158d12f71f401f4b51346d528aad86ad7be7",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84",
Expand Down
3 changes: 3 additions & 0 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- ovn-kubernetes image-arm64 6c78b6defbd606f8fdf002d7cc37e3d49c7bcd98 to 1faf1ac5bb2e604f745d93a5fe70bec93024ad7f
- 0eb16983 2025-11-26T14:56:03+08:00 Fix conntrack reconciliation to use service port instead of endpoint port

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 @@ -30,6 +30,6 @@ https://github.com/openshift/coredns image-arm64 6f39336e6da9dc77b2db140a96773c4
https://github.com/openshift/csi-external-snapshotter image-arm64 42604822c25eb2aa0ecb017c24e328221b238eb9
https://github.com/openshift/router image-arm64 db8d384266051ef06b67883aaa83674bc6c9f1ae
https://github.com/openshift/kube-rbac-proxy image-arm64 b9134351be37c43408334047d8eb85d0ac01fe4e
https://github.com/openshift/ovn-kubernetes image-arm64 6c78b6defbd606f8fdf002d7cc37e3d49c7bcd98
https://github.com/openshift/ovn-kubernetes image-arm64 1faf1ac5bb2e604f745d93a5fe70bec93024ad7f
https://github.com/openshift/kubernetes image-arm64 33a825ebe5da727e8ccce0fb3c9d33fce7c6bdd9
https://github.com/openshift/service-ca-operator image-arm64 37e0c31790b6a954214817974a56c9a699d0cf78
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.20.0-0.nightly-2025-12-25-211554" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2025-12-25-173637"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2025-12-25-211554" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2026-01-04-033324"