NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-01-31-130653_amd6…

…4-2024-01-31_arm64-2024-02-01 (#2963) * update last_rebase.sh * update changelog * update manifests * update buildfiles --------- Co-authored-by: ci-robot <ci-robot@openshift.io>
openshift · Feb 2, 2024 · c6a3001 · c6a3001
1 parent 28121f2
commit c6a3001
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var
@@ -1 +1 @@
-OCP_VERSION := 4.15.0-0.nightly-arm64-2024-01-30-193622
+OCP_VERSION := 4.15.0-0.nightly-arm64-2024-02-01-210039
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.15.0-0.nightly-arm64-2024-01-30-193622"
+    "base": "4.15.0-0.nightly-arm64-2024-02-01-210039"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ff5e2c1b48be07d24b5fa60bcd334ffd5f883907e52558dcbc0aab157029b49",

diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json
@@ -1,14 +1,14 @@
 {
   "release": {
-    "base": "4.15.0-0.nightly-arm64-2024-01-30-193622"
+    "base": "4.15.0-0.nightly-arm64-2024-02-01-210039"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ec26589cc5095599474e1e2e107dc8ac91e4a615913fdb619769f1ccd34f704",
     "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f08244d5d98029ad649602148954b21ea3448e881ec7a9fe8fca7861c334118a",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b121e3d81f3eb17f8dd76caa184de50d4b3e6500ffdef2dfba71f0ad13ff917",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:087f964be2a732fe52d72e3cc4254ff559ef4c6f728f71dbd4a4e9869d60a5d9",
     "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:93ae02264cc4c9c3fad5c92b1f356141f6a3273fe9f24e1a33a335d8ed11676f",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f9686e1381f314898adaf0a96b08a8646679fe3adc659b287539e49ddd4d490",
     "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66c2f922ed3c97124d51dd82865148dc70e2c1b3691f24eba133e2b578c1084e",
     "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b07230dc57b4ae83677ce58feef27791de19c2e48b671d0b304b0100f7a4ecc",
     "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73",

diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
@@ -1,4 +1,3 @@
-- cluster-network-operator embedded-component d4ebd6af6ca400f22acd071532be50da7eae0f4b to a1ddc470cb58e599d16b7a7878cc37a339b47b0f
-  - 5f4573e 2024-01-25T16:04:26+00:00 Add unit tests for function ensureMachineConfigPools
-  - e5071b4 2024-01-25T16:04:26+00:00 Not update migration conditions when any MCP is updating
+- ovn-kubernetes image-arm64 2476c75ade680f6324391be71a6edfe15fb60d98 to e61d7efcc919d441e223d9be34fad8457c25a125
+  - 7a62709 2024-01-25T10:09:10+02:00 Fix LGW ETP=Local on IPv6
 
diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt
@@ -33,6 +33,6 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 090cd57847b98a
 https://github.com/openshift/csi-external-snapshotter image-arm64 090cd57847b98aebe42ecd5091c3a626eb870022
 https://github.com/openshift/router image-arm64 b7001137f832d02d4ed68cba27fe3001ff523fa6
 https://github.com/openshift/kube-rbac-proxy image-arm64 e8e8c84bcc6d4419970726f3028df4b178c0b1c9
-https://github.com/openshift/ovn-kubernetes image-arm64 2476c75ade680f6324391be71a6edfe15fb60d98
+https://github.com/openshift/ovn-kubernetes image-arm64 e61d7efcc919d441e223d9be34fad8457c25a125
 https://github.com/openshift/kubernetes image-arm64 0fb47263bee9d427fb36e6581023d40bce8933d1
 https://github.com/openshift/service-ca-operator image-arm64 f5972cc74670c274bdc2b29d0903c4ed0432b9ca
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.15.0-0.nightly-2024-01-31-130653" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-01-30-193622"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-01-31-130653" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-02-01-210039"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		OCP_VERSION := 4.15.0-0.nightly-arm64-2024-01-30-193622
		OCP_VERSION := 4.15.0-0.nightly-arm64-2024-02-01-210039