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-01-19-193147
OCP_VERSION := 4.14.0-0.nightly-arm64-2025-01-22-193147
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-01-19-193149
OCP_VERSION := 4.14.0-0.nightly-2025-01-22-024525
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-01-19-193147"
"base": "4.14.0-0.nightly-arm64-2025-01-22-193147"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cbe6b253acb5398a684f503b0ddc0111bc21f422c951d689d31c12cf82bc67a3",
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-01-19-193149"
"base": "4.14.0-0.nightly-2025-01-22-024525"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a5527750e07a3bbc64e2b64fd712c12125b1e6f9e310124f6aea36684724d8f",
Expand Down
4 changes: 2 additions & 2 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
- cluster-network-operator embedded-component 9a0391243931ff480885f5dbcee8e34a1212aeb7 to 8ad9fcdadcbc0cae358f7e277349d194b32e8277
- defa7da 2025-01-16T03:36:23-05:00 Pass transit_switch_subnet options in ovnkube-node pod for single-zone
- openshift-controller-manager embedded-component a25aab6f01ae68758978ca449a640d75c25562f4 to 6e86dee5d30921e84f557ca214022e587c824e88
- 5db1854 2025-01-16T07:14:31+00:00 NO-JIRA: Add team members to the OWNERS file

2 changes: 1 addition & 1 deletion scripts/auto-rebase/commits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ https://github.com/openshift/etcd embedded-component 5ed5044c5661c55d297ab034805
https://github.com/openshift/kubernetes embedded-component 03a907c6d182353a0e9b83a224a6f0398406f6d5
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 8558e14a116804168506d06e96eac5a79913a6eb
https://github.com/openshift/machine-config-operator embedded-component 4f8b6f2a0e1a8ec475e5ef1dd8effd9306804518
https://github.com/openshift/openshift-controller-manager embedded-component a25aab6f01ae68758978ca449a640d75c25562f4
https://github.com/openshift/openshift-controller-manager embedded-component 6e86dee5d30921e84f557ca214022e587c824e88
https://github.com/openshift/route-controller-manager embedded-component 1a5e72f41b21f5ebcd6f9dd8227d92ad1fffbb1e
https://github.com/openshift/service-ca-operator embedded-component 3c3f82f7112ee4b5656e5c554f9887acdf881175
https://github.com/openshift/oc image-amd64 44b3ac26e654777e0283759d45a2b3351823fc5e
Expand Down
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-01-19-193149" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2025-01-19-193147"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2025-01-22-024525" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2025-01-22-193147"