Skip to content

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-06-11-200645_amd64-2024-06-11_arm64-2024-06-12 #3479

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
Jun 13, 2024
Merged

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-06-11-200645_amd64-2024-06-11_arm64-2024-06-12 #3479

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
d52ad53
update last_rebase.sh
Jun 13, 2024
bc722ff
update changelog
Jun 13, 2024
b897877
update manifests
Jun 13, 2024
88cd7f1
update buildfiles
Jun 13, 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-06-11-233153
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-06-12-223752
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-06-11-233153"
"base": "4.15.0-0.nightly-arm64-2024-06-12-223752"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:518b56b3ec1e32071ed70f544ba3003583bdc8327bc96f2ab3591f3eb662d1b3",
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-06-11-233153"
"base": "4.15.0-0.nightly-arm64-2024-06-12-223752"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4a6cfbf67a0a5b81c6a4d5eb9eec5cd7671faf813df9e04fb3c5b80e5c1ee8b",
Expand Down
9 changes: 0 additions & 9 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +0,0 @@
- machine-config-operator embedded-component aaf1a8d2265fe934977300a229fde6d49166646f to 4a4385ccb8c61013b04e5699d4a8d148e6e2a535
- a80a795e 2024-06-06T12:55:17+00:00 manifests: set required-scc for openshift workloads

- oc image-amd64 7693229513083646fe3a83a0fec6e651e4866d8d to 44edfb50c55756395abc844fc4f7edb19dfefa50
- b9c28eea 2024-06-10T13:14:20+03:00 Bump joelanford/ignore to bump go-git to 5.11.0

- oc image-arm64 7693229513083646fe3a83a0fec6e651e4866d8d to 44edfb50c55756395abc844fc4f7edb19dfefa50
- b9c28eea 2024-06-10T13:14:20+03:00 Bump joelanford/ignore to bump go-git to 5.11.0

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-06-11-200645" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-06-11-233153"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-06-11-200645" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-06-12-223752"