diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index e59e481ba8..e4db441897 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-arm64-2025-04-04-203853 +OCP_VERSION := 4.14.0-0.nightly-arm64-2025-04-09-192152 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 47e1ca96f3..9e6419ec56 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-2025-04-03-062919 +OCP_VERSION := 4.14.0-0.nightly-2025-04-07-185142 diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 6c6da2efde..2e75cb0fc0 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.14.0-0.nightly-arm64-2025-04-04-203853" + "base": "4.14.0-0.nightly-arm64-2025-04-09-192152" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac3f935a635587eda498952afff0d9ffa43654cd32e6d24eb62556cbe9767678", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index c475b226fd..21f4b39c9b 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.14.0-0.nightly-2025-04-03-062919" + "base": "4.14.0-0.nightly-2025-04-07-185142" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c08bd2d276de9ad9ae8718b4bccfda2cfe35ca68f1f0a7f433e646514ff47164", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 36966f9650..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +0,0 @@ -- machine-config-operator embedded-component e999361cfc7c83c2ffe30a1b64443083da5fccf1 to 555364e98951e9e316aaf91d021b61fe17340bda - - 678b425b 2025-03-25T14:45:07-04:00 kubelet_config_controller: Update ObservedGeneration render_controller: Make function name AreMCGeneratingSubControllersCompletedForPool explicit apihelpers: match the KubeletConfig to the Pool using MachineConfigPoolSelector - diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 39a2622d5c..929ee2dd6f 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.14.0-0.nightly-2025-04-03-062919" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2025-04-04-203853" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2025-04-07-185142" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2025-04-09-192152"