From 3ca585bc4cea754260eebfda73ce953fca172beb Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 31 May 2023 05:29:30 +0000 Subject: [PATCH 1/4] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 1a88bd6491..524160f462 100755 --- 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-2023-05-29-174116" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-05-29-213325" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-05-30-110231" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-05-31-005735" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" From 46a9e8485eac638b35e0ee6cd4556175cdc7bcaf Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 31 May 2023 05:29:30 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 13 +++++++++++++ scripts/auto-rebase/commits.txt | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..83693af1ac 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,13 @@ +- ovn-kubernetes image-arm64 0f2fbd9d43d2681ad4bffb2f4a7b85a195fc989b to 8adae676ccfed289ea097ac70afe7970dca3f820 + - 34cc232 2023-05-26T10:46:42+02:00 Bump OVN RPMs to 23.03.0-49.el9fdp + - 61e0379 2023-04-05T19:02:52+02:00 lb_config: Reduce number of required LB backend templates for NodePort. + - 4b3475a 2023-04-05T19:02:46+02:00 services: Use OVN template load balancers for NodePort services. + - 91b2e29 2023-04-05T09:38:22+02:00 model_client: Properly update map values. + - 0cdb9ec 2023-04-05T09:38:22+02:00 fedora: Update OVN to 23.03.0-16. + - 7e7e141 2023-04-05T09:38:22+02:00 dbs: Bump OVN schema to 23.03. + - b79d290 2023-04-05T09:38:22+02:00 Rename OVN_VERSION to OVN_SCHEMA_VERSION. + - 3207e3f 2023-04-05T09:38:22+02:00 lb_config: Merge LB referenced groups when merging LBs. + - c258f60 2023-04-05T09:38:22+02:00 node_tracker: Store node IPs as net.IP instead of string. + - 9ded3d8 2023-04-05T09:38:22+02:00 node_tracker: Track node chassis IDs too. + - b1fba8f 2023-04-05T09:38:22+02:00 services_controller_test: Test with LB groups enabled. + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 3490882ad1..0fc25e3e68 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -23,6 +23,6 @@ https://github.com/openshift/oc image-arm64 943559197d1a94253672e26dbc356e062df7 https://github.com/openshift/coredns image-arm64 a2c62dd3976b27d6a45e273532c63ba914700917 https://github.com/openshift/router image-arm64 5426a9b1597b9afd70b9d49caebe00cee6cc433f https://github.com/openshift/kube-rbac-proxy image-arm64 27c255551673ba529ac6c9419abe13451afa3e4d -https://github.com/openshift/ovn-kubernetes image-arm64 0f2fbd9d43d2681ad4bffb2f4a7b85a195fc989b +https://github.com/openshift/ovn-kubernetes image-arm64 8adae676ccfed289ea097ac70afe7970dca3f820 https://github.com/openshift/kubernetes image-arm64 15f19ea2dd700767e5337502aec753d2a6e26905 https://github.com/openshift/service-ca-operator image-arm64 f0bd313003d3d79593b44936fb7cf0bab2a6daae From 8faa2c9c42b9833c912f18436c708f0dead72bd0 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 31 May 2023 05:30:46 +0000 Subject: [PATCH 3/4] update manifests --- assets/release/release-aarch64.json | 4 ++-- assets/release/release-x86_64.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 39169758f3..a4628dd41c 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.14.0-0.nightly-arm64-2023-05-29-213325" + "base": "4.14.0-0.nightly-arm64-2023-05-31-005735" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da5c4030977a609c772df895d29dceb3cb7de04d79f562383e45bd5a3a11fbd7", @@ -8,7 +8,7 @@ "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0a6c89984beaf048a9f1bd3b0d1efb4c9b72a00c5e624e6f27a1658398588c6", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdb4624ae6ca43927a96a0c45c14ea5653f9efefe0c68461a312c11993314de2", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35f473711e299ff139531e42dd928db515e1fd4a7aba626020d05a0fc1382a0a", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:771d3089075769224171eee4a9bf4d60b8567398b31776606d163953c2588972", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fb7cc3de4736623adeba1d648ebd24b4a45d904194151a49934b3e9f83d23321", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18d52f0a34b818b2245398ba6b9003bbb320e8c4c36bd18db3f4399746a4b698", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 3f9baabc09..cc2ddfedef 100644 --- 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-2023-05-29-174116" + "base": "4.14.0-0.nightly-2023-05-30-110231" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:582002579baee453f78c25e43fce62f42a8161edc8c87daf966a9e957d03b42a", From 07252192ac898b6eee721559ac2d5dab27a2cb0a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 31 May 2023 05:30:47 +0000 Subject: [PATCH 4/4] update buildfiles --- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 3dc14aa3c6..0765d08bab 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-arm64-2023-05-29-213325 +OCP_VERSION := 4.14.0-0.nightly-arm64-2023-05-31-005735 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 85d80bc377..3c9c8ee07c 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-2023-05-29-174116 +OCP_VERSION := 4.14.0-0.nightly-2023-05-30-110231