Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.14.0-0.nightly-2025-04-03-062919
OCP_VERSION := 4.14.0-0.nightly-2025-04-07-185142
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
3 changes: 0 additions & 3 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
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.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"