Skip to content

NO-ISSUE: rebase-main-4.19.0-0.nightly-2024-12-23-182133_amd64-2024-12-23_arm64-2024-12-23 #4355

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
Dec 24, 2024
Merged

NO-ISSUE: rebase-main-4.19.0-0.nightly-2024-12-23-182133_amd64-2024-12-23_arm64-2024-12-23 #4355

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
77f55bb
update last_rebase.sh
Dec 24, 2024
71e2cd7
update changelog
Dec 24, 2024
c092b67
update manifests
Dec 24, 2024
679d698
update buildfiles
Dec 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.19.0-0.nightly-arm64-2024-12-22-054943
OCP_VERSION := 4.19.0-0.nightly-arm64-2024-12-23-223122
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.19.0-0.nightly-2024-12-21-202735
OCP_VERSION := 4.19.0-0.nightly-2024-12-23-182133
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.19.0-0.nightly-arm64-2024-12-22-054943"
"base": "4.19.0-0.nightly-arm64-2024-12-23-223122"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ecfae89c530c3bc40085299a973fea1d8ec7e237212d7a7296f455ba852b478",
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.19.0-0.nightly-2024-12-21-202735"
"base": "4.19.0-0.nightly-2024-12-23-182133"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ba87d15e49bf4b0ec404e0ad6c2ee4f2c20cfc2bdd5fb725136a157dc2ad2f1",
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.19.0-0.nightly-arm64-2024-12-22-054943"
"base": "4.19.0-0.nightly-arm64-2024-12-23-223122"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5198dd1e09caa1ffa728636b52582cb4decca2211815ce16412ea59395f2fc30",
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.19.0-0.nightly-2024-12-21-202735"
"base": "4.19.0-0.nightly-2024-12-23-182133"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd702a31c36add2ac295d1719a90325ebca8108df2a85ef37a00dc2d54e8ad04",
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.19.0-0.nightly-arm64-2024-12-22-054943"
"base": "4.19.0-0.nightly-arm64-2024-12-23-223122"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50f1aa40a784505aa06d99ba8550b947b2a6f948675e46c4d8d7e0e41131c390",
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.19.0-0.nightly-2024-12-21-202735"
"base": "4.19.0-0.nightly-2024-12-23-182133"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:36cd18d28cc0b664aa2dbfa3c08e0b69a240642f5d1c3c7021670e8a1e11c75a",
Expand Down
471 changes: 2 additions & 469 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/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
https://github.com/openshift/api embedded-component b88d0670990113e8e3e87017aaab5968d2e7339a
https://github.com/openshift/api embedded-component 188620a9ab5eaad36199cf83d9a0afcb08fdfd52
https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 9dceffb866318acb2bb77182095a18b6f397416f
https://github.com/openshift/cluster-dns-operator embedded-component 0a9deeea4c335e259747b35267811a4a040289fd
https://github.com/openshift/cluster-ingress-operator embedded-component dbdff16b1173dd3992e5be42203e8afbae1cb06f
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.19.0-0.nightly-2024-12-21-202735" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2024-12-22-054943"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2024-12-23-182133" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2024-12-23-223122"