Skip to content

NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-05-24-193308_amd64-2024-05-24_arm64-2024-06-03 #3432

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 4, 2024
Merged

NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-05-24-193308_amd64-2024-05-24_arm64-2024-06-03 #3432

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
9ba967a
update last_rebase.sh
Jun 4, 2024
22d5efa
update changelog
Jun 4, 2024
d098f7c
update manifests
Jun 4, 2024
4ab455b
update buildfiles
Jun 4, 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.17.0-0.nightly-arm64-2024-06-02-224131
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-06-03-194837
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-06-02-224131"
"base": "4.17.0-0.nightly-arm64-2024-06-03-194837"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:784ffaf9726c83ff250cdba0952745f9dcd32a8c76642aea6b8a469578921df3",
Expand Down
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.17.0-0.nightly-arm64-2024-06-02-224131"
"base": "4.17.0-0.nightly-arm64-2024-06-03-194837"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b13cf2ff7feeab314f8a6a61d7518e7f5bfbfdd344bda075bd824c8ffae38be",
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.17.0-0.nightly-arm64-2024-06-02-224131"
"base": "4.17.0-0.nightly-arm64-2024-06-03-194837"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40d3fe3e0988d8ab81c8d48d8395647e1339772e8f7e415f81b2741cddee5d4b",
Expand Down
6 changes: 0 additions & 6 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +0,0 @@
- oc image-arm64 d5b5b3a62fa4743a9e7a9cd4779b08d7f3e58c31 to 0bea0594b2cdb44de33be3a96f8ac2cf68e10ee2
- 75151619 2024-05-31T16:59:04+02:00 `upgrade status`: polish alert insights
- 4b531b2d 2024-05-30T17:10:08+02:00 pkg/cli/expose: override print flags for cmd
- 18405673 2024-05-30T17:10:08+02:00 pkg/cli/create,pkg/cli/expose: use custom scheme
- 109236a1 2024-05-30T17:10:03+02:00 pkg/helpers/scheme: stop loading legacy schemes on global scheme

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.17.0-0.nightly-2024-05-24-193308" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-02-224131"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-05-24-193308" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-03-194837"