Skip to content

NO-ISSUE: rebase-4.14.0-0.nightly-2024-06-22-052248_amd64-2024-06-22_arm64-2024-06-23 #3530

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
merged 4 commits into from
Jun 24, 2024
Merged

NO-ISSUE: rebase-4.14.0-0.nightly-2024-06-22-052248_amd64-2024-06-22_arm64-2024-06-23 #3530

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
c547da7
update last_rebase.sh
Jun 24, 2024
98219bc
update changelog
Jun 24, 2024
2a301c8
update manifests
Jun 24, 2024
de5cead
update buildfiles
Jun 24, 2024
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-2024-06-20-121034
OCP_VERSION := 4.14.0-0.nightly-arm64-2024-06-23-234710
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-2024-06-20-201725
OCP_VERSION := 4.14.0-0.nightly-2024-06-22-052248
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-2024-06-20-121034"
"base": "4.14.0-0.nightly-arm64-2024-06-23-234710"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ad0928d592f3046445b968dfaf8f7e8fb7713e58a3f41d8b53ce62bcf5d85dc",
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-2024-06-20-201725"
"base": "4.14.0-0.nightly-2024-06-22-052248"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8821eedd639928d59d102e19b8fe35de308a276e8d25a984fa755af7db4bf99e",
Expand Down
6 changes: 6 additions & 0 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- cluster-network-operator embedded-component 796bf8f5d5268e1123f033a644b7c7abf3bec823 to 9a032c35c32e05f7e88c4e8eacaed9bf3cce4037
- 611288e 2024-06-10T11:04:22+02:00 Add unit test for ipsec rendering during 4.13->4.14 upgrade
- 3491df0 2024-06-07T17:10:25+02:00 Use same kubeclient subtype in upgrade code
- c74b612 2024-06-07T17:08:02+02:00 Fix ipsec status for 4.13->4.14 upgrades and use constants for ipsec
- e3d8fc0 2024-06-04T20:13:06+02:00 Make ipsec available all throughout 4.13->4.14 upgrade

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 @@ -4,7 +4,7 @@ https://github.com/openshift/cluster-ingress-operator embedded-component fe438b8
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 4302637f4d521bd9880de93df6bc41d44a4b0756
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 796bf8f5d5268e1123f033a644b7c7abf3bec823
https://github.com/openshift/cluster-network-operator embedded-component 9a032c35c32e05f7e88c4e8eacaed9bf3cce4037
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 3985c55f99e1ea013be2db096059c09b2ed98118
https://github.com/openshift/cluster-policy-controller embedded-component 219f6f6f072d867201d4923d39fd8bcaecbe7c59
https://github.com/openshift/csi-external-snapshotter embedded-component a6834536936b16dcd9ee81a8753a2ef6dc208541
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-2024-06-20-201725" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-06-20-121034"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-06-22-052248" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-06-23-234710"