Skip to content

NO-ISSUE: rebase-4.14.0-0.nightly-2025-02-05-042159_amd64-2025-02-05_arm64-2025-02-05 #4512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 4 commits into from
Feb 6, 2025
Merged

NO-ISSUE: rebase-4.14.0-0.nightly-2025-02-05-042159_amd64-2025-02-05_arm64-2025-02-05 #4512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b77527e
update last_rebase.sh
Feb 6, 2025
11bb1fd
update changelog
Feb 6, 2025
87fcceb
update manifests
Feb 6, 2025
8b642a4
update buildfiles
Feb 6, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.14.0-0.nightly-arm64-2025-02-01-145111
OCP_VERSION := 4.14.0-0.nightly-arm64-2025-02-05-013018
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.14.0-0.nightly-2025-01-31-072527
OCP_VERSION := 4.14.0-0.nightly-2025-02-05-042159
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.14.0-0.nightly-arm64-2025-02-01-145111"
"base": "4.14.0-0.nightly-arm64-2025-02-05-013018"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d67594088f1ebf6c4687a5dc6ac1440961333104d2b2432731b9d08c93099ab",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.14.0-0.nightly-2025-01-31-072527"
"base": "4.14.0-0.nightly-2025-02-05-042159"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ece1b42feebf4f3c4ba87d738056dd85c288df7632ac7d3fe8c2163d1967e07",
Expand Down
4 changes: 2 additions & 2 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
- machine-config-operator embedded-component 4f8b6f2a0e1a8ec475e5ef1dd8effd9306804518 to caedf7e7dacfd1bded0e93b430d6dba7aecf92df
- 638e48cd 2025-01-27T10:29:08+08:00 trying to wait for sub-contorllers
- cluster-openshift-controller-manager-operator embedded-component accd87730fd3652584bef210626cab3b6d49271f to 09d62091346f86f54938587acfd680f6bd6b7af6
- 8971d4c 2025-01-24T09:54:02+00:00 OCPBUGS-48832: add new team members to the OWNERS file

2 changes: 1 addition & 1 deletion scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ https://github.com/openshift/cluster-kube-apiserver-operator embedded-component
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 4e059638c2cbf003551ee699106dc024760eece3
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 33f630dc1f890ca59c5e57fb5b6cc24a3f22a1d4
https://github.com/openshift/cluster-network-operator embedded-component 8ad9fcdadcbc0cae358f7e277349d194b32e8277
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component accd87730fd3652584bef210626cab3b6d49271f
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 09d62091346f86f54938587acfd680f6bd6b7af6
https://github.com/openshift/cluster-policy-controller embedded-component 219f6f6f072d867201d4923d39fd8bcaecbe7c59
https://github.com/openshift/csi-external-snapshotter embedded-component a6834536936b16dcd9ee81a8753a2ef6dc208541
https://github.com/openshift/etcd embedded-component 5ed5044c5661c55d297ab0348056b50969af9627
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
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-31-072527" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2025-02-01-145111"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2025-02-05-042159" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2025-02-05-013018"