From 70468ff4e6f7da5c1b9d88019dc6a13fa480b586 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 17 Jan 2025 04:15:22 +0000 Subject: [PATCH 1/4] 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 a317215a2f..5745c35a55 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-15-030107" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-01-15-090110" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-01-15-030107" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-01-16-183318" From a1a0b54a0b4e384a3e1549c128114ca1d5c210ea Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 17 Jan 2025 04:15:22 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 33 ------------------------------- 1 file changed, 33 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 7ffb9c7657..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,33 +0,0 @@ -- kubernetes embedded-component 205ac00c56dd2340b90dc0e328be84e77219197c to 11e2f11d1e0ce2fadc11906f2bcbba1ddbb2da2f - - d4eba929c 2024-12-11T15:53:08-03:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - - 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. - - a78aa4712 2024-12-10T11:37:26+00:00 Release commit for Kubernetes v1.31.4 - - 80964efae 2024-11-27T13:29:30+00:00 fix isLikelyNotMountPointStatx relative path issue - - 779a0827a 2024-11-21T14:55:35+01:00 Bump images, dependencies and versions to go 1.22.9 and distroless iptables - - 953a3a8aa 2024-11-19T14:02:11+00:00 Update CHANGELOG/CHANGELOG-1.31.md for v1.31.3 - - ea299acf9 2024-11-14T20:00:41+02:00 Ensure that a node's CIDR isn't released until the node is deleted - -- machine-config-operator embedded-component a964f19a214946f0e5f1197c545d3805393d0705 to 0672e126107b97c6f98d8fa2a8404f776f7be052 - - 93050862 2024-12-19T14:47:04+00:00 crio: drop crun subcgroup - -- kubernetes image-amd64 205ac00c56dd2340b90dc0e328be84e77219197c to 11e2f11d1e0ce2fadc11906f2bcbba1ddbb2da2f - - d4eba929c 2024-12-11T15:53:08-03:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - - 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. - - a78aa4712 2024-12-10T11:37:26+00:00 Release commit for Kubernetes v1.31.4 - - 80964efae 2024-11-27T13:29:30+00:00 fix isLikelyNotMountPointStatx relative path issue - - 779a0827a 2024-11-21T14:55:35+01:00 Bump images, dependencies and versions to go 1.22.9 and distroless iptables - - 953a3a8aa 2024-11-19T14:02:11+00:00 Update CHANGELOG/CHANGELOG-1.31.md for v1.31.3 - - ea299acf9 2024-11-14T20:00:41+02:00 Ensure that a node's CIDR isn't released until the node is deleted - -- kubernetes image-arm64 d93c78ae6fd13542228ed371626bee3c3e8d7e91 to 11e2f11d1e0ce2fadc11906f2bcbba1ddbb2da2f - - d4eba929c 2024-12-11T15:53:08-03:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - - a78aa4712 2024-12-10T11:37:26+00:00 Release commit for Kubernetes v1.31.4 - - 80964efae 2024-11-27T13:29:30+00:00 fix isLikelyNotMountPointStatx relative path issue - - 779a0827a 2024-11-21T14:55:35+01:00 Bump images, dependencies and versions to go 1.22.9 and distroless iptables - - 953a3a8aa 2024-11-19T14:02:11+00:00 Update CHANGELOG/CHANGELOG-1.31.md for v1.31.3 - - ea299acf9 2024-11-14T20:00:41+02:00 Ensure that a node's CIDR isn't released until the node is deleted - From bad78426d71c43643e70f6cd19d32357345788ab Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 17 Jan 2025 04:15:51 +0000 Subject: [PATCH 3/4] update manifests --- assets/optional/multus/release-multus-aarch64.json | 2 +- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- assets/release/release-aarch64.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index cbd5c19e85..abbea197ae 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-15-090110" + "base": "4.18.0-0.nightly-arm64-2025-01-16-183318" }, "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 db32645684..401786a2eb 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-15-090110" + "base": "4.18.0-0.nightly-arm64-2025-01-16-183318" }, "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 49f349acca..8ac45b239f 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-15-090110" + "base": "4.18.0-0.nightly-arm64-2025-01-16-183318" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e97a1610f2cca76626c497f02401518309e3c323d113d4c5eed2aced9a8f895", From 24a01a2a545907480ca5b53a270fc62463c92233 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 17 Jan 2025 04:15:52 +0000 Subject: [PATCH 4/4] 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 30dea86ade..24486f3587 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-arm64-2025-01-15-090110 +OCP_VERSION := 4.18.0-0.nightly-arm64-2025-01-16-183318