NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2024-06-03-060250_amd64-2024-06-03_arm64-2024-06-03 (#3431)

microshift-rebase-script[bot] · ci-robot · web-flow · commit 894ac9aef2b0 · 2024-06-04T05:43:49.000Z
* update last_rebase.sh

* update changelog

* 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.16.0-0.nightly-arm64-2024-06-02-232232
+OCP_VERSION := 4.16.0-0.nightly-arm64-2024-06-03-200520
diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var
@@ -1 +1 @@
-OCP_VERSION := 4.16.0-0.nightly-2024-06-02-202327
+OCP_VERSION := 4.16.0-0.nightly-2024-06-03-060250
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.16.0-0.nightly-arm64-2024-06-02-232232"
+    "base": "4.16.0-0.nightly-arm64-2024-06-03-200520"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2dfb3b49a0d6fa10f589ecacc8578f7447c830d3dcd24006811721ada8329a94",
diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.16.0-0.nightly-2024-06-02-202327"
+    "base": "4.16.0-0.nightly-2024-06-03-060250"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:daa12838cee6c5a3f5235bf4505bd7c8bcbe7e36deb2219f9057bb283dd5c9c3",
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.16.0-0.nightly-arm64-2024-06-02-232232"
+    "base": "4.16.0-0.nightly-arm64-2024-06-03-200520"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b6455e0dbc02ff431a1adc06beb7a916b438b0edca6c316aaff184da8d538e2",
diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.16.0-0.nightly-2024-06-02-202327"
+    "base": "4.16.0-0.nightly-2024-06-03-060250"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:612296c176a8c387fbd415b7f8346dac1aeba34db00079126610c63af7eed62c",
diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json
@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.16.0-0.nightly-arm64-2024-06-02-232232"
+    "base": "4.16.0-0.nightly-arm64-2024-06-03-200520"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:961bb3802a67c4c92337b76de2bc36f0e7b511b57535917caae29dd666b7cc08",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25ae0e9de662ea4bbf205b541c7e71a8027cae205b402bce52845232e4d1045b",
     "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ee246fe2e0fe358d0756d4f21b85d57b59cdd7a1e2ad643fe1b425c118d487e4",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52933771cee5efadea1dd7ad47a50c75d8b0aa85b5155ce76ce12d6b44b777d3",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4457c8bd7f1d27b89ad7ea994d76ea2bbd05ba02bf2fb86bfff03f07c37c0f1e",
diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.16.0-0.nightly-2024-06-02-202327"
+    "base": "4.16.0-0.nightly-2024-06-03-060250"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ac250546ce1b8226ccc4a50aec8996a70a79bccbf43e3c02e514e3a83defa96",
diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
@@ -0,0 +1,3 @@
+- oc image-arm64 12a2e98239d503af3e8e30a6fa9d0186c9524b77 to f9d6c50fee8b143733f9a0d210d1095b5e5ff77d
+  - eacf0666 2024-05-20T14:43:41+00:00 pkg/cli/admin/upgrade/rollback: Gate on OC_ENABLE_CMD_UPGRADE_ROLLBACK
+
diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt
@@ -26,7 +26,7 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d
 https://github.com/openshift/ovn-kubernetes image-amd64 d90fa545e17a27bdf253fa820a1d7552e3079465
 https://github.com/openshift/kubernetes image-amd64 87992f48b0ead9af80145861d1bffff0810e70d9
 https://github.com/openshift/service-ca-operator image-amd64 538c7b98a689e573b61e1abb1cb649da470c5fac
-https://github.com/openshift/oc image-arm64 12a2e98239d503af3e8e30a6fa9d0186c9524b77
+https://github.com/openshift/oc image-arm64 f9d6c50fee8b143733f9a0d210d1095b5e5ff77d
 https://github.com/openshift/coredns image-arm64 5afff2a989779a52e00ef9579cfbc03f36b5334a
 https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28
 https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28
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.16.0-0.nightly-2024-06-02-202327" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-06-02-232232"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-06-03-060250" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-06-03-200520"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.16.0-0.nightly-arm64-2024-06-02-232232`
	`1`	`+OCP_VERSION := 4.16.0-0.nightly-arm64-2024-06-03-200520`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.16.0-0.nightly-2024-06-02-202327`
	`1`	`+OCP_VERSION := 4.16.0-0.nightly-2024-06-03-060250`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "4.16.0-0.nightly-arm64-2024-06-02-232232"`
	`3`	`+ "base": "4.16.0-0.nightly-arm64-2024-06-03-200520"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2dfb3b49a0d6fa10f589ecacc8578f7447c830d3dcd24006811721ada8329a94",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "4.16.0-0.nightly-2024-06-02-202327"`
	`3`	`+ "base": "4.16.0-0.nightly-2024-06-03-060250"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:daa12838cee6c5a3f5235bf4505bd7c8bcbe7e36deb2219f9057bb283dd5c9c3",`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+- oc image-arm64 12a2e98239d503af3e8e30a6fa9d0186c9524b77 to f9d6c50fee8b143733f9a0d210d1095b5e5ff77d`
	`2`	`+ - eacf0666 2024-05-20T14:43:41+00:00 pkg/cli/admin/upgrade/rollback: Gate on OC_ENABLE_CMD_UPGRADE_ROLLBACK`
	`3`	`+`