Skip to content

Commit 06f9841

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-03-21-030708_amd64-2025-03-21_arm64-2025-03-26 (#4734)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent e3d4197 commit 06f9841

File tree

9 files changed

+19
-12
lines changed

9 files changed

+19
-12
lines changed

‎Makefile.version.aarch64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-25-001623
1+
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-26-001623

‎assets/optional/multus/kustomization.aarch64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ images:
55
digest: sha256:750b41e57c2fbfa3ed582c01ea000e534d66c1ac3ea1410288205554de2c46fb
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:966e6909570a372fcacd09681a828d9bcf57d2e77020f4b5f1277edb6cf40868
8+
digest: sha256:65a0f91d4b23e94f2d0b2d32bf47bda7020987d4668a1b19e1bd4715e3546ee7

‎assets/optional/multus/release-multus-aarch64.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-arm64-2025-03-25-001623"
3+
"base": "4.19.0-0.nightly-arm64-2025-03-26-001623"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:750b41e57c2fbfa3ed582c01ea000e534d66c1ac3ea1410288205554de2c46fb",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:966e6909570a372fcacd09681a828d9bcf57d2e77020f4b5f1277edb6cf40868"
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65a0f91d4b23e94f2d0b2d32bf47bda7020987d4668a1b19e1bd4715e3546ee7"
88
}
99
}

‎assets/optional/operator-lifecycle-manager/release-olm-aarch64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-arm64-2025-03-25-001623"
3+
"base": "4.19.0-0.nightly-arm64-2025-03-26-001623"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea4132023c1e9b8c905dd87b77f45d50139760eb73c9c563ae7a873af5a01679",

‎assets/release/release-aarch64.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-arm64-2025-03-25-001623"
3+
"base": "4.19.0-0.nightly-arm64-2025-03-26-001623"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d8c4b589090f40aa80c6c1035d2e4fd77504096cfcf6fc184e9e0ea529ae9d4",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4fc1a08dc6e15c424adddd3725c033ac24846298ffc8176e13db1b674df32c37",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75f1ed729aca82c2d32b00451a98fa68d1d4910fad968e310a50647eec8aa15b",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf218c10be35ac48a7b4dc7f7fae559cdda361e96de69a18f871ed58e28e60a7",
10-
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d8a61c504fbce35195668bfc4cabdac871f6bf22fe237e2fae9277e5499ac0a",
11-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9bf6b64922cd0445d4a2a7c21b5eccc677d9d292eb98be66dc2b63c7392961a6",
10+
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e46039efe12ad42d2b0e14589f09a41e8fa27c2f0c8214e56052d0685604ab25",
11+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e368696ded62c3e21ca6493b090fab06d4dc120446fe098f02fbb4f21fdff337",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a6158a564cc28fbed19620ae77b8fa4f0f5cae96bd475143f5293658e8cee9a",
1313
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:03771d66c0ed8a422c012ffaf6f390d8c3191e02330ef9b9dee00af518928d6e",
1414
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1a77322350b3a5888b1ad6665ef94a3b477beeedb628ae722b7852ff581b834d"

‎packaging/crio.conf.d/10-microshift_arm64.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ plugin_dirs = [
2525
# for community builds on top of OKD, this setting has no effect
2626
[crio.image]
2727
global_auth_file="/etc/crio/openshift-pull-secret"
28-
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9bf6b64922cd0445d4a2a7c21b5eccc677d9d292eb98be66dc2b63c7392961a6"
28+
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e368696ded62c3e21ca6493b090fab06d4dc120446fe098f02fbb4f21fdff337"
2929
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
3030
pause_command = "/usr/bin/pod"

‎scripts/auto-rebase/changelog.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
- ovn-kubernetes image-arm64 66faee9937abbd9abc8e72e160c6fb2f4e606e9b to 12b33c120f3240ed9df2bdfcc01d3bd0a313b3c7
2+
- 9c4499b0 2025-03-20T14:51:14+01:00 Update OVN to FDP25.A.1 24.09.2-41.
3+
4+
- kubernetes image-arm64 1601b9e27d8570364d9a1b94be16a0ca7b744a7e to d365efdad4f566821463becaf0d5551a1a5c322f
5+
- e8636393a 2025-03-21T08:42:50-03:00 UPSTREAM: <drop>: update test annotations
6+
- de143cff7 2025-03-21T08:38:12-03:00 UPSTREAM: <carry>: annotate networking test as broken as per Jira ticket
7+

‎scripts/auto-rebase/commits.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ https://github.com/openshift/coredns image-arm64 7a1451db77a68161d58af9b6ca2c938
3030
https://github.com/openshift/csi-external-snapshotter image-arm64 1fc6ee158070b34f84a94489b33accb333714727
3131
https://github.com/openshift/router image-arm64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6
3232
https://github.com/openshift/kube-rbac-proxy image-arm64 591277560f328601273f88f2881e09ccccd90a97
33-
https://github.com/openshift/ovn-kubernetes image-arm64 66faee9937abbd9abc8e72e160c6fb2f4e606e9b
34-
https://github.com/openshift/kubernetes image-arm64 1601b9e27d8570364d9a1b94be16a0ca7b744a7e
33+
https://github.com/openshift/ovn-kubernetes image-arm64 12b33c120f3240ed9df2bdfcc01d3bd0a313b3c7
34+
https://github.com/openshift/kubernetes image-arm64 d365efdad4f566821463becaf0d5551a1a5c322f
3535
https://github.com/openshift/service-ca-operator image-arm64 fdd9502ff3446725b4f1fbf6902547dba9266061

‎scripts/auto-rebase/last_rebase.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash -x
2-
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-03-21-030708" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-03-25-001623"
2+
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-03-21-030708" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-03-26-001623"

0 commit comments

Comments
 (0)