From e985428685336a87deec3ce263fc05c5738ca8eb Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 15 Jan 2025 04:10:50 +0000 Subject: [PATCH 1/5] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index d1cd59328f..b8dc56945c 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-01-13-114945" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-01-13-174945" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-01-13-114945" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-01-14-173318" From 2df3e5341c0fcfa9f35ddd3ed194233a68925b52 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 15 Jan 2025 04:10:50 +0000 Subject: [PATCH 2/5] update changelog --- scripts/auto-rebase/changelog.txt | 5 +++++ scripts/auto-rebase/commits.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..d1edb5a3cb 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,5 @@ +- kubernetes image-arm64 205ac00c56dd2340b90dc0e328be84e77219197c to d93c78ae6fd13542228ed371626bee3c3e8d7e91 + - 5d18fcd9c 2024-12-11T15:40:47+00:00 UPSTREAM: : require configuration file enablement + - a2bc30e98 2024-12-11T15:40:46+00:00 UPSTREAM: 126750: update comments + - 08daca616 2024-12-11T15:40:46+00:00 UPSTREAM: 126750: Add takeByTopologyUnCoreCachePacked if policy option align-cpus-by-uncorecache is enabled. Adding new function to evaluate uncore cache id. Reverse allocation logic. Implement preferAlignByUncorecache within TakeByTopologyNUMAPacked, along with new test cases. + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 7c42b982e1..a4a35b6b66 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -33,5 +33,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 f52ce8b8b0799a https://github.com/openshift/router image-arm64 be319d0bb83f75b52b707df46422f6892dfaaa56 https://github.com/openshift/kube-rbac-proxy image-arm64 526498ab32996a0f67a96530ad7173f955e3fbe2 https://github.com/openshift/ovn-kubernetes image-arm64 930d8645c00fd2273c4cbb6e1d3c057e0967f0a1 -https://github.com/openshift/kubernetes image-arm64 205ac00c56dd2340b90dc0e328be84e77219197c +https://github.com/openshift/kubernetes image-arm64 d93c78ae6fd13542228ed371626bee3c3e8d7e91 https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755 From 7f735f7087f78e629bced61e0a71fef59222dc94 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 15 Jan 2025 04:11:22 +0000 Subject: [PATCH 3/5] update component images --- packaging/crio.conf.d/10-microshift_arm64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index d4081df275..3647d2a8b1 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -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:2175ea09614a38845e1bfaf139655c0cc7110739b5acebd6d89242bb3cf7dfed" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b8548a3a65394f4e82397fd759a0a80a77d41c875f2db817d8034e5bd3848bf" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 8a1838bba9c4b60bc730083f56bcd61c06383b12 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 15 Jan 2025 04:11:25 +0000 Subject: [PATCH 4/5] update manifests --- assets/optional/multus/release-multus-aarch64.json | 2 +- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- assets/release/release-aarch64.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index fd99720ef6..851f12606e 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2025-01-13-174945" + "base": "4.18.0-0.nightly-arm64-2025-01-14-173318" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05394287fd690e589778264f7272c968e4cf87137005272af48082729d35c5af", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 6b679b7dfe..f9c02842cc 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2025-01-13-174945" + "base": "4.18.0-0.nightly-arm64-2025-01-14-173318" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb8a571aaacdbc3653d4a6b93e3e854c7f4bb8ccc4b50d47eca0df178dd935e3", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 3ba7a84adb..cef470b80d 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2025-01-13-174945" + "base": "4.18.0-0.nightly-arm64-2025-01-14-173318" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e97a1610f2cca76626c497f02401518309e3c323d113d4c5eed2aced9a8f895", @@ -8,7 +8,7 @@ "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ebf06deb7ce22e50a5c66be3c52674eb53337e967fe7397f7e8327c784ca49b", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03f1644f600af057ccf8ae3fd544d6a0dc72f079f97f9db98e00ed8c9779c26d", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc34ba5a77e872e2a7b9918166f522ea22154f87738e34f65acc0fdc4c2e5a30", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2175ea09614a38845e1bfaf139655c0cc7110739b5acebd6d89242bb3cf7dfed", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b8548a3a65394f4e82397fd759a0a80a77d41c875f2db817d8034e5bd3848bf", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49f294bfc07141d8d238566373651845cc5137dcf93f9de2029b448d79b26235", "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:610c51e225c86c53aa1a30fd354f744e1e62a7578169f161969522fe88c27af4", From 0a866475e7653df1d43d4bd4acf9d5bb856aa85c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 15 Jan 2025 04:11:56 +0000 Subject: [PATCH 5/5] update buildfiles --- Makefile.version.aarch64.var | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 48ff51f6ef..166fdba400 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-arm64-2025-01-13-174945 +OCP_VERSION := 4.18.0-0.nightly-arm64-2025-01-14-173318