NO-ISSUE: rebase-main-4.19.0-0.nightly-2024-12-31-163734_amd64-2024-12-31_arm64-2025-01-01 (#4373)

microshift-rebase-script[bot] · ci-robot · web-flow · commit b343e2aeb103 · 2025-01-02T10:17:31.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.19.0-0.nightly-arm64-2024-12-30-225444
+OCP_VERSION := 4.19.0-0.nightly-arm64-2025-01-01-165722
diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var
@@ -1 +1 @@
-OCP_VERSION := 4.19.0-0.nightly-2024-12-30-153915
+OCP_VERSION := 4.19.0-0.nightly-2024-12-31-163734
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.19.0-0.nightly-arm64-2024-12-30-225444"
+    "base": "4.19.0-0.nightly-arm64-2025-01-01-165722"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ecfae89c530c3bc40085299a973fea1d8ec7e237212d7a7296f455ba852b478",
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.19.0-0.nightly-2024-12-30-153915"
+    "base": "4.19.0-0.nightly-2024-12-31-163734"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ba87d15e49bf4b0ec404e0ad6c2ee4f2c20cfc2bdd5fb725136a157dc2ad2f1",
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.19.0-0.nightly-arm64-2024-12-30-225444"
+    "base": "4.19.0-0.nightly-arm64-2025-01-01-165722"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5198dd1e09caa1ffa728636b52582cb4decca2211815ce16412ea59395f2fc30",
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.19.0-0.nightly-2024-12-30-153915"
+    "base": "4.19.0-0.nightly-2024-12-31-163734"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd702a31c36add2ac295d1719a90325ebca8108df2a85ef37a00dc2d54e8ad04",
diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.19.0-0.nightly-arm64-2024-12-30-225444"
+    "base": "4.19.0-0.nightly-arm64-2025-01-01-165722"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50f1aa40a784505aa06d99ba8550b947b2a6f948675e46c4d8d7e0e41131c390",
diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.19.0-0.nightly-2024-12-30-153915"
+    "base": "4.19.0-0.nightly-2024-12-31-163734"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:36cd18d28cc0b664aa2dbfa3c08e0b69a240642f5d1c3c7021670e8a1e11c75a",
diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
@@ -0,0 +1,3 @@
+- cluster-network-operator embedded-component de93ea6e09e9afda32bc0a95a08b7b703ce31985 to 9d96bcc4fc4653970e135a87ce380b0fb57f0587
+  - 29cb6f9 2024-12-27T10:32:48+00:00 Add support for route advertisements
+
diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt
@@ -5,7 +5,7 @@ https://github.com/openshift/cluster-ingress-operator embedded-component dbdff16
 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 218530fdea4e89b93bc6e136d8b5d8c3beacdd51
 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component c8341b6b72ad221f16a5276729138adf9a347abe
 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component b1cc4471e2f6c5dc81b2b9471f4634f1ecdb88b4
-https://github.com/openshift/cluster-network-operator embedded-component de93ea6e09e9afda32bc0a95a08b7b703ce31985
+https://github.com/openshift/cluster-network-operator embedded-component 9d96bcc4fc4653970e135a87ce380b0fb57f0587
 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 0b04b66c041c19abc6a04a31fc5b2688249eb0de
 https://github.com/openshift/cluster-policy-controller embedded-component 327d3cbd82fd013a9d5d5733eb04cc0dcd97aec5
 https://github.com/openshift/csi-external-snapshotter embedded-component 1fc6ee158070b34f84a94489b33accb333714727
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.19.0-0.nightly-2024-12-30-153915" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2024-12-30-225444"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2024-12-31-163734" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-01-01-165722"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.19.0-0.nightly-arm64-2024-12-30-225444`
	`1`	`+OCP_VERSION := 4.19.0-0.nightly-arm64-2025-01-01-165722`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.19.0-0.nightly-2024-12-30-153915`
	`1`	`+OCP_VERSION := 4.19.0-0.nightly-2024-12-31-163734`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "4.19.0-0.nightly-arm64-2024-12-30-225444"`
	`3`	`+ "base": "4.19.0-0.nightly-arm64-2025-01-01-165722"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ecfae89c530c3bc40085299a973fea1d8ec7e237212d7a7296f455ba852b478",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "4.19.0-0.nightly-2024-12-30-153915"`
	`3`	`+ "base": "4.19.0-0.nightly-2024-12-31-163734"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ba87d15e49bf4b0ec404e0ad6c2ee4f2c20cfc2bdd5fb725136a157dc2ad2f1",`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+- cluster-network-operator embedded-component de93ea6e09e9afda32bc0a95a08b7b703ce31985 to 9d96bcc4fc4653970e135a87ce380b0fb57f0587`
	`2`	`+ - 29cb6f9 2024-12-27T10:32:48+00:00 Add support for route advertisements`
	`3`	`+`