Skip to content

NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-01-30-091858_amd64-2025-01-30_arm64-2025-02-02 #4503

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 5 commits into from
Feb 3, 2025
Merged

NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-01-30-091858_amd64-2025-01-30_arm64-2025-02-02 #4503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
52d24c7
update last_rebase.sh
Feb 3, 2025
8912985
update changelog
Feb 3, 2025
80e2f5c
update component images
Feb 3, 2025
58b5b07
update manifests
Feb 3, 2025
3ac5da0
update buildfiles
Feb 3, 2025
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-2025-01-30-141534
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-02-02-210059
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-2025-01-30-141534"
"base": "4.19.0-0.nightly-arm64-2025-02-02-210059"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c540d189b0f243b6fa305c3644d844356d772237e75752dcde01fc31f58490c8",
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-2025-01-30-141534"
"base": "4.19.0-0.nightly-arm64-2025-02-02-210059"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cfbc8c6027dffb3044a24dc9a0bc282152fa4494255421f1c9a70722249f7c12",
Expand Down
8 changes: 4 additions & 4 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2025-01-30-141534"
"base": "4.19.0-0.nightly-arm64-2025-02-02-210059"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28ffaff18b43f11cf84c4c8cb763718cc4ff161d795672dfa5aee777075d32e3",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32076806d809043cd6deea3bccdbe4e1148df1ef035e619fe3c924e8c185039e",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d49d94fffab78b0cd20ffdf3b5a644903d4d818bdc2f3e293d8e3156dcf04eb3",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:048ba6aae93ed11b5084670542959ef6a04196049615ca7e42bb321e47c8233d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ecef5ac12b405027435a355ee88df1bb37971bb53b747a26721eca35042c2f2",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2472083f471db7eeee5b115ed29b1093e4fc580e8f1dd81942425187d5895478",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:93bb5f084abc8a35cc631201a57eeea97c12d09fa67b0c6160f5dbfba39cad68",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e53aaca3b3fd2a875029e582a2b07b69f025866776f233023a475a1f6f6fa80c",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dba567bb2cbea5e0b75b9d3d3087f3a605981da19599c498c834de40956b659d",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2bc1e439da54ec1aeb87e02655f39152fdac170b283c69344d3486523694d2cc",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ca960bd4dfa53dc3301c5e3101ae7df3acf034db5ff66ddd4c565f8f3265ebd"
Expand Down
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_arm64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ plugin_dirs = [
# for community builds on top of OKD, this setting has no effect
[crio.image]
global_auth_file="/etc/crio/openshift-pull-secret"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:93bb5f084abc8a35cc631201a57eeea97c12d09fa67b0c6160f5dbfba39cad68"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dba567bb2cbea5e0b75b9d3d3087f3a605981da19599c498c834de40956b659d"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
3,673 changes: 21 additions & 3,652 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ https://github.com/openshift/service-ca-operator image-amd64 1e65678429c82df5ae9
https://github.com/openshift/oc image-arm64 1ab51e8ae705b76381478f3c729321a97f83bac3
https://github.com/openshift/coredns image-arm64 7a1451db77a68161d58af9b6ca2c9388d578310a
https://github.com/openshift/csi-external-snapshotter image-arm64 1fc6ee158070b34f84a94489b33accb333714727
https://github.com/openshift/router image-arm64 20f7f41430f7c660438c32532ccd7b453b014b68
https://github.com/openshift/router image-arm64 b447c4d27d38a6c5f6ce2d5ceda88dbc9b90c661
https://github.com/openshift/kube-rbac-proxy image-arm64 23f96a23777c1b5fcdb587602c156903c32fe52c
https://github.com/openshift/ovn-kubernetes image-arm64 dcb1b19e7463c93053bd05ac6bde416154632c94
https://github.com/openshift/kubernetes image-arm64 cc13ce0f2f8bed35ac14af6be2895e7fcf4e6623
https://github.com/openshift/ovn-kubernetes image-arm64 d7ee0a462da13315de6ba9cb184e7fea58b7ce50
https://github.com/openshift/kubernetes image-arm64 ae495d909ff59bcd47de6dd82635da4d5ca3a9ac
https://github.com/openshift/service-ca-operator image-arm64 1e65678429c82df5ae97da4dde8dbe03d75062e6
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-2025-01-30-091858" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-01-30-141534"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-01-30-091858" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-02-02-210059"