Skip to content

Commit 18afbba

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-01-15-030107_amd64-2025-01-15_arm64-2025-01-16 (#4423)
* update last_rebase.sh * update changelog * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 90cb8c6 commit 18afbba

File tree

6 files changed

+5
-38
lines changed

6 files changed

+5
-38
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.18.0-0.nightly-arm64-2025-01-15-090110
1+
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-01-16-183318

‎assets/optional/multus/release-multus-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.18.0-0.nightly-arm64-2025-01-15-090110"
3+
"base": "4.18.0-0.nightly-arm64-2025-01-16-183318"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05394287fd690e589778264f7272c968e4cf87137005272af48082729d35c5af",

‎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.18.0-0.nightly-arm64-2025-01-15-090110"
3+
"base": "4.18.0-0.nightly-arm64-2025-01-16-183318"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb8a571aaacdbc3653d4a6b93e3e854c7f4bb8ccc4b50d47eca0df178dd935e3",

‎assets/release/release-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.18.0-0.nightly-arm64-2025-01-15-090110"
3+
"base": "4.18.0-0.nightly-arm64-2025-01-16-183318"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e97a1610f2cca76626c497f02401518309e3c323d113d4c5eed2aced9a8f895",

‎scripts/auto-rebase/changelog.txt

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +0,0 @@
1-
- kubernetes embedded-component 205ac00c56dd2340b90dc0e328be84e77219197c to 11e2f11d1e0ce2fadc11906f2bcbba1ddbb2da2f
2-
- d4eba929c 2024-12-11T15:53:08-03:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
3-
- 5d18fcd9c 2024-12-11T15:40:47+00:00 UPSTREAM: <carry>: require configuration file enablement
4-
- a2bc30e98 2024-12-11T15:40:46+00:00 UPSTREAM: 126750: update comments
5-
- 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.
6-
- a78aa4712 2024-12-10T11:37:26+00:00 Release commit for Kubernetes v1.31.4
7-
- 80964efae 2024-11-27T13:29:30+00:00 fix isLikelyNotMountPointStatx relative path issue
8-
- 779a0827a 2024-11-21T14:55:35+01:00 Bump images, dependencies and versions to go 1.22.9 and distroless iptables
9-
- 953a3a8aa 2024-11-19T14:02:11+00:00 Update CHANGELOG/CHANGELOG-1.31.md for v1.31.3
10-
- ea299acf9 2024-11-14T20:00:41+02:00 Ensure that a node's CIDR isn't released until the node is deleted
11-
12-
- machine-config-operator embedded-component a964f19a214946f0e5f1197c545d3805393d0705 to 0672e126107b97c6f98d8fa2a8404f776f7be052
13-
- 93050862 2024-12-19T14:47:04+00:00 crio: drop crun subcgroup
14-
15-
- kubernetes image-amd64 205ac00c56dd2340b90dc0e328be84e77219197c to 11e2f11d1e0ce2fadc11906f2bcbba1ddbb2da2f
16-
- d4eba929c 2024-12-11T15:53:08-03:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
17-
- 5d18fcd9c 2024-12-11T15:40:47+00:00 UPSTREAM: <carry>: require configuration file enablement
18-
- a2bc30e98 2024-12-11T15:40:46+00:00 UPSTREAM: 126750: update comments
19-
- 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.
20-
- a78aa4712 2024-12-10T11:37:26+00:00 Release commit for Kubernetes v1.31.4
21-
- 80964efae 2024-11-27T13:29:30+00:00 fix isLikelyNotMountPointStatx relative path issue
22-
- 779a0827a 2024-11-21T14:55:35+01:00 Bump images, dependencies and versions to go 1.22.9 and distroless iptables
23-
- 953a3a8aa 2024-11-19T14:02:11+00:00 Update CHANGELOG/CHANGELOG-1.31.md for v1.31.3
24-
- ea299acf9 2024-11-14T20:00:41+02:00 Ensure that a node's CIDR isn't released until the node is deleted
25-
26-
- kubernetes image-arm64 d93c78ae6fd13542228ed371626bee3c3e8d7e91 to 11e2f11d1e0ce2fadc11906f2bcbba1ddbb2da2f
27-
- d4eba929c 2024-12-11T15:53:08-03:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
28-
- a78aa4712 2024-12-10T11:37:26+00:00 Release commit for Kubernetes v1.31.4
29-
- 80964efae 2024-11-27T13:29:30+00:00 fix isLikelyNotMountPointStatx relative path issue
30-
- 779a0827a 2024-11-21T14:55:35+01:00 Bump images, dependencies and versions to go 1.22.9 and distroless iptables
31-
- 953a3a8aa 2024-11-19T14:02:11+00:00 Update CHANGELOG/CHANGELOG-1.31.md for v1.31.3
32-
- ea299acf9 2024-11-14T20:00:41+02:00 Ensure that a node's CIDR isn't released until the node is deleted
33-

‎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.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"
2+
./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"

0 commit comments

Comments
 (0)