Skip to content

NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-07-08-042329_amd64-2024-07-08_arm64-2024-07-08 #3604

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

Closed
microshift-rebase-script wants to merge 4 commits into from
Closed

NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-07-08-042329_amd64-2024-07-08_arm64-2024-07-08 #3604

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
f16b921
update last_rebase.sh
Jul 9, 2024
1a4c1e6
update changelog
Jul 9, 2024
9ccfc0f
update manifests
Jul 9, 2024
558c314
update buildfiles
Jul 9, 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-07-07-223550
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-07-08-022101
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.17.0-0.nightly-2024-07-07-131215
OCP_VERSION := 4.17.0-0.nightly-2024-07-08-042329
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-07-07-223550"
"base": "4.17.0-0.nightly-arm64-2024-07-08-022101"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a80b9a73be66874a92a7a96de6fa43754ef0382aa4b2822c486561ca84fbd097",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-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.17.0-0.nightly-2024-07-07-131215"
"base": "4.17.0-0.nightly-2024-07-08-042329"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e3fd630f1665f2d196e402147e4340371edf1f74cd6b883bb67a34392b506c00",
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-07-07-223550"
"base": "4.17.0-0.nightly-arm64-2024-07-08-022101"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35cf47e3814da26461b94d2963bb2b958391c7e53fa2229185307357467aab5d",
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.17.0-0.nightly-2024-07-07-131215"
"base": "4.17.0-0.nightly-2024-07-08-042329"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87ccc17ae6d1e17a03958a0a3a5dd826df3b8d4d942101441d76698d173f0816",
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-07-07-223550"
"base": "4.17.0-0.nightly-arm64-2024-07-08-022101"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ba119d6e3692cacecb67ba1bd8a5d13f8a15536da6391c6a2bd37d8988630fd0",
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.17.0-0.nightly-2024-07-07-131215"
"base": "4.17.0-0.nightly-2024-07-08-042329"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11a45829bdb7ab3d8644b55abbaebc384f9c540a857f91a65680639f16dd63fa",
Expand Down
280 changes: 0 additions & 280 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop

Large diffs are not rendered by default.

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-07-07-131215" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-07-07-223550"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-07-08-042329" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-07-08-022101"