From eb52e71d05bfa363657ab2c515619e201729e992 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 26 Dec 2025 04:14:16 +0000 Subject: [PATCH 1/3] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index c7b63c7527..8963f3e6ba 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2025-12-24-191318" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2025-12-24-234930" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2025-12-25-181920" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2025-12-25-234930" From 55cecbb00ed2b1609aab95c1a20812128e89c972 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 26 Dec 2025 04:15:55 +0000 Subject: [PATCH 2/3] update manifests --- assets/components/multus/release-multus-aarch64.json | 2 +- assets/components/multus/release-multus-x86_64.json | 2 +- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- .../optional/operator-lifecycle-manager/release-olm-x86_64.json | 2 +- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index d94d1c9d10..37cf610498 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2025-12-24-234930" + "base": "4.21.0-0.nightly-arm64-2025-12-25-234930" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05e4dae9e1a0104ec5bf61c7f36b84cb153857b2918c0ad937299adde7e561c1", diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 960bc49662..e292b1f25f 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-2025-12-24-191318" + "base": "4.21.0-0.nightly-2025-12-25-181920" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b13469b9b98f43298939efc9a8b113d0c48930e401c3f9bfc223089a0c7f20c4", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 292e60f937..37236614e3 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2025-12-24-234930" + "base": "4.21.0-0.nightly-arm64-2025-12-25-234930" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91948688e347b355b3adee9944a09668fb226801897360b206e1e14987a155c8", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index 2f785b47af..554b18e1d9 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-2025-12-24-191318" + "base": "4.21.0-0.nightly-2025-12-25-181920" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:93846c31a6aef05baea9b45372fc53dcb1e8598eee2bcc73210bff6b6ae3e6f3", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 9b6a763aad..66f14d4da8 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2025-12-24-234930" + "base": "4.21.0-0.nightly-arm64-2025-12-25-234930" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:61fde2654826a0b825a95ffcda44b646fdde0a6a130a9bca45181b1fe5ed91be", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 95403a9bc5..1585487d4b 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-2025-12-24-191318" + "base": "4.21.0-0.nightly-2025-12-25-181920" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0fb592c7c59bae38bd9179db0926d49bd8d070c4fa25a09a1832600512511e1f", From e952cbdebc3c7d184c8ecf508fe0efbb0d999b7e Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 26 Dec 2025 04:15:55 +0000 Subject: [PATCH 3/3] update buildfiles --- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index b5f4cf1d9b..ee546e68f0 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-arm64-2025-12-24-234930 +OCP_VERSION := 4.21.0-0.nightly-arm64-2025-12-25-234930 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 28e0b0b1da..d43d0568a1 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-2025-12-24-191318 +OCP_VERSION := 4.21.0-0.nightly-2025-12-25-181920