From 264ee5b5edee13920bd97c3b026e7f0b44ba4134 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 21 Apr 2026 04:23:34 +0000 Subject: [PATCH 1/4] 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 14b97384df..e794a09c8c 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.22.0-0.nightly-2026-04-18-162844" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-04-19-224615" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-04-18-162844" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-04-20-224618" From 2ce8b45241b3ba0efe8889f8afffd4c00c0eb5a9 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 21 Apr 2026 04:23:35 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 3dc5708fda..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,11 +0,0 @@ -- machine-config-operator embedded-component 449e78f7ec941d8db237da39ccce2095912fea43 to eadf8329c93aba9b187de7668ec3e469bc6d168e - - a152664a 2026-04-16T06:05:37Z chore: update AMIs - - 85109ddb 2026-04-15T17:31:52Z Bug OCPEDGE-2447: fix filename collision in ovs-configuration drop-in - - e08af2ec 2026-04-15T17:31:52Z Bug OCPEDGE-2447: prevent configure-ovs.sh re-execution within same boot - - bf61c18f 2026-04-15T17:31:52Z Bug OCPEDGE-2447: order corosync after OVS configuration on TNF clusters - - 1a6b213d 2026-04-15T14:29:02+02:00 Revert "Merge pull request #5797 from mkowalski/more-cpu-for-ovs" - -- ovn-kubernetes image-amd64 e327d43ff04f410b1d9f301a6484af5359a98d3d to 14b5022bad5b21334e3ad9d500763474016b2a9c - - 68ccf1f1 2026-04-15T08:59:44Z openshift tests: disable - - f6098fc2 2026-04-15T08:58:44Z openshift tests: demote to informing - From 7b5f7cc33eaca5b5af2159644464a29c024b019a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 21 Apr 2026 04:25:21 +0000 Subject: [PATCH 3/4] update manifests --- assets/components/multus/release-multus-aarch64.json | 2 +- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- assets/release/release-aarch64.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 1f173271be..ef121a5110 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.22.0-0.nightly-arm64-2026-04-19-224615" + "base": "4.22.0-0.nightly-arm64-2026-04-20-224618" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b5dea1a4af066d607b01598dfd50e061d9c2e3d65f8c30c1bd3abb056b33152", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index c4e2365b9f..891d70de1b 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.22.0-0.nightly-arm64-2026-04-19-224615" + "base": "4.22.0-0.nightly-arm64-2026-04-20-224618" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ffe14ab720dcf34fdb9bdcfab9e0c7819ed10de29235aa2a3d42de4ed83ba0f", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index c2c6a15fa7..d4148755a4 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.22.0-0.nightly-arm64-2026-04-19-224615" + "base": "4.22.0-0.nightly-arm64-2026-04-20-224618" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96c2ca56b7adee081586d205524adfed461168f1e0a40fd3b8038083fd77d43d", From 2570eda2b9c1625b8171254f449b8542e03f282a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 21 Apr 2026 04:25:23 +0000 Subject: [PATCH 4/4] update buildfiles --- Makefile.version.aarch64.var | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index e711bd5158..f9e26c1845 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.22.0-0.nightly-arm64-2026-04-19-224615 +OCP_VERSION := 4.22.0-0.nightly-arm64-2026-04-20-224618