NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2024-12-26-082500_amd64-2024-12-26_arm64-2024-12-29 (#4367)

microshift-rebase-script[bot] · ci-robot · web-flow · commit 018e64f8fe23 · 2024-12-30T11:35:29.000Z
* update last_rebase.sh

* update manifests

* update buildfiles

---------

Co-authored-by: ci-robot &lt;ci-robot@openshift.io&gt;
diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var
@@ -1 +1 @@
-OCP_VERSION := 4.18.0-0.nightly-arm64-2024-12-26-082518
+OCP_VERSION := 4.18.0-0.nightly-arm64-2024-12-29-211758
diff --git 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-2024-12-26-082518"
+    "base": "4.18.0-0.nightly-arm64-2024-12-29-211758"
   },
   "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
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2024-12-26-082518"
+    "base": "4.18.0-0.nightly-arm64-2024-12-29-211758"
   },
   "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
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2024-12-26-082518"
+    "base": "4.18.0-0.nightly-arm64-2024-12-29-211758"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b5be7b37095eca816e3c3742e4b14c1aa4cd9b43c73d555de4233109a7b224c",
diff --git 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-2024-12-26-082500" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-12-26-082518"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-12-26-082500" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-12-29-211758"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.18.0-0.nightly-arm64-2024-12-26-082518`
	`1`	`+OCP_VERSION := 4.18.0-0.nightly-arm64-2024-12-29-211758`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "4.18.0-0.nightly-arm64-2024-12-26-082518"`
	`3`	`+ "base": "4.18.0-0.nightly-arm64-2024-12-29-211758"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05394287fd690e589778264f7272c968e4cf87137005272af48082729d35c5af",`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#!/bin/bash -x`
`2`		`-./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-12-26-082500" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-12-26-082518"`
	`2`	`+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-12-26-082500" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-12-29-211758"`