NO-ISSUE: rebase-4.14.0-0.nightly-2024-06-25-193927_amd64-2024-06-25_arm64-2024-06-25 (#3543)

microshift-rebase-script[bot] · ci-robot · web-flow · commit 489eb807ad85 · 2024-06-26T09:17:14.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.14.0-0.nightly-arm64-2024-06-24-164008
+OCP_VERSION := 4.14.0-0.nightly-arm64-2024-06-25-232409
diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var
@@ -1 +1 @@
-OCP_VERSION := 4.14.0-0.nightly-2024-06-24-110225
+OCP_VERSION := 4.14.0-0.nightly-2024-06-25-193927
diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.14.0-0.nightly-arm64-2024-06-24-164008"
+    "base": "4.14.0-0.nightly-arm64-2024-06-25-232409"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ad0928d592f3046445b968dfaf8f7e8fb7713e58a3f41d8b53ce62bcf5d85dc",
diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.14.0-0.nightly-2024-06-24-110225"
+    "base": "4.14.0-0.nightly-2024-06-25-193927"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8821eedd639928d59d102e19b8fe35de308a276e8d25a984fa755af7db4bf99e",
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.14.0-0.nightly-2024-06-24-110225" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-06-24-164008"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-06-25-193927" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-06-25-232409"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.14.0-0.nightly-arm64-2024-06-24-164008`
	`1`	`+OCP_VERSION := 4.14.0-0.nightly-arm64-2024-06-25-232409`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.14.0-0.nightly-2024-06-24-110225`
	`1`	`+OCP_VERSION := 4.14.0-0.nightly-2024-06-25-193927`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "4.14.0-0.nightly-arm64-2024-06-24-164008"`
	`3`	`+ "base": "4.14.0-0.nightly-arm64-2024-06-25-232409"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ad0928d592f3046445b968dfaf8f7e8fb7713e58a3f41d8b53ce62bcf5d85dc",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "4.14.0-0.nightly-2024-06-24-110225"`
	`3`	`+ "base": "4.14.0-0.nightly-2024-06-25-193927"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8821eedd639928d59d102e19b8fe35de308a276e8d25a984fa755af7db4bf99e",`
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.14.0-0.nightly-2024-06-24-110225" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-06-24-164008"`
	`2`	`+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-06-25-193927" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-06-25-232409"`