Skip to content

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-07-25-172725_amd64-2024-07-25_arm64-2024-07-25 #3682

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
Jul 26, 2024
Merged

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-07-25-172725_amd64-2024-07-25_arm64-2024-07-25 #3682

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
6d76813
update last_rebase.sh
Jul 26, 2024
29f24e1
update changelog
Jul 26, 2024
f876aa6
update manifests
Jul 26, 2024
f5dc5a3
update buildfiles
Jul 26, 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.15.0-0.nightly-arm64-2024-07-24-220718
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-07-25-223123
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.15.0-0.nightly-2024-07-24-150754
OCP_VERSION := 4.15.0-0.nightly-2024-07-25-172725
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2024-07-24-220718"
"base": "4.15.0-0.nightly-arm64-2024-07-25-223123"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3952ada86beaa57743331b8014beadac751ce1e4b3499f65b6bff20f0d2215fe",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/release-olm-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.15.0-0.nightly-2024-07-24-150754"
"base": "4.15.0-0.nightly-2024-07-25-172725"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:567991b15bc4615590916c428aa9d1d835f4f076c5fd268eacb6cebddb17d925",
Expand Down
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.15.0-0.nightly-arm64-2024-07-24-220718"
"base": "4.15.0-0.nightly-arm64-2024-07-25-223123"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a6c7447aea28bc530d5688e0b61bffa3ab626f10f850fef7a495ddd6583047e",
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.15.0-0.nightly-2024-07-24-150754"
"base": "4.15.0-0.nightly-2024-07-25-172725"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7b6e2497941cc22e6539224697c1e99eaa012d3dcdc96456800dd89f470bd86",
Expand Down
3 changes: 3 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,3 @@
- cluster-network-operator embedded-component 3a06784187564c89dffbc0dd9378fb4feaa03005 to 6d9f739ffab69717b0ffee2bfb97d99118cc88a4
- 0bed685 2024-07-17T14:35:55+00:00 Check every MachineConfigPool for IPsec plugin existence

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 0928822
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 62a9eff944bfbdc1b4e79332fe4d8ae2df053c8c
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component ee8cf52558df0862f9927dbc7275fbe6cc1a1e5f
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component f054dfaf189b43b262c11ef7f97038c79592c796
https://github.com/openshift/cluster-network-operator embedded-component 3a06784187564c89dffbc0dd9378fb4feaa03005
https://github.com/openshift/cluster-network-operator embedded-component 6d9f739ffab69717b0ffee2bfb97d99118cc88a4
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 45d342cb8ecde4e2fe51ceb613827fb3d219b8a0
https://github.com/openshift/cluster-policy-controller embedded-component cc48f3152213bfe6e42fdd82f760246e862d208f
https://github.com/openshift/csi-external-snapshotter embedded-component 4f2955c7c90cd150f9dfae782148d0fa8eba7342
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.15.0-0.nightly-2024-07-24-150754" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-07-24-220718"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-07-25-172725" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-07-25-223123"