NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-11-15-113437_amd64-2024-1…

…1-15_arm64-2024-11-20 (#4209) * update last_rebase.sh * update changelog * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
openshift · Nov 21, 2024 · bfd3ba1 · bfd3ba1
1 parent 4de142b
commit bfd3ba1
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 8 deletions.
diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var
@@ -1 +1 @@
-OCP_VERSION := 4.18.0-0.nightly-arm64-2024-11-19-231707
+OCP_VERSION := 4.18.0-0.nightly-arm64-2024-11-20-111707
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-11-19-231707"
+    "base": "4.18.0-0.nightly-arm64-2024-11-20-111707"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc8c9cfecca09dafbe866755e9089a352c6556380a341cb68a108cfba03409c2",

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-11-19-231707"
+    "base": "4.18.0-0.nightly-arm64-2024-11-20-111707"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5217caa1e7590f493aa65c2cf30da20fecc2f3800b8e720dddb09913c1b8a0ed",

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-11-19-231707"
+    "base": "4.18.0-0.nightly-arm64-2024-11-20-111707"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f89b442c74a548fd070d417a89b1030553d71bbdd34f40dc6cccf1a104ae1f8",

diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
@@ -1,3 +0,0 @@
-- oc image-arm64 b36ab488abc0f0afe97b5724a51e0364b66e2003 to bdce85daf64eda40dd1b604270b85c67a296bc93
-  - d47e1619 2024-11-15T14:26:17-05:00 upgrade status: show updating cluster operator names in the output
-

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-11-15-113437" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-11-19-231707"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-11-15-113437" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-11-20-111707"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		OCP_VERSION := 4.18.0-0.nightly-arm64-2024-11-19-231707
		OCP_VERSION := 4.18.0-0.nightly-arm64-2024-11-20-111707
Original file line number	Diff line number	Diff line change
		@@ -1,3 +0,0 @@
		- oc image-arm64 b36ab488abc0f0afe97b5724a51e0364b66e2003 to bdce85daf64eda40dd1b604270b85c67a296bc93
		- d47e1619 2024-11-15T14:26:17-05:00 upgrade status: show updating cluster operator names in the output