From ec1cccd85b8fb4740bc947b5c1157c832103346f Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 10 Jun 2024 04:13:02 +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 2b351b1ad4..242a163056 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.15.0-0.nightly-2024-06-06-075858" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-06-06-210449" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-06-06-075858" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-06-07-063811" From 476e59a5d1bb1931d934cea74f722ce7463c148d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 10 Jun 2024 04:13:02 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 32 +++---------------------------- scripts/auto-rebase/commits.txt | 2 +- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 6c584ef0c4..a634b3cf0f 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,30 +1,4 @@ -- cluster-ingress-operator embedded-component 9fc0b5c93e5da4ce37ee5e191992e44218311549 to 37f7c42f4fea6f4668e5447f420d3a55b8e9f287 - - 4761708 2024-06-04T18:42:49+00:00 TestHostNetworkPortBinding: Delete t.Parallel() - -- cluster-kube-apiserver-operator embedded-component 18ad29cd8ac095a980cd135345f3e251fbf06667 to eae692607f7ef1cfc6ef95bcd57c67f04d2c165c - - a106338 2024-02-12T15:10:22+00:00 operator: stop removing kube-apiserver-slos asset - -- service-ca-operator embedded-component f5972cc74670c274bdc2b29d0903c4ed0432b9ca to 19f312e96bb4e5b7da9f61ea4cab202b227a60c6 - - cc99940 2024-05-30T09:44:14+00:00 set required-scc for openshift workloads - -- router image-amd64 4b6be4ddcbe7dae2b08f305fc823d1718f2563f7 to dc38fbd84dfbed3a897f2d36b469d0ccfd1ecda3 - - fa20a24 2024-05-30T12:59:43-04:00 Optimize Upgrade Validation plugin by skipping unnecessary changes - - 504796a 2024-05-30T12:59:43-04:00 Make ingressConditionsEqual more efficient - - f0dc7d1 2024-05-30T12:59:43-04:00 Add log for attempting to update route status - - 914e07a 2024-05-30T12:59:43-04:00 Add verbose logging for plugin chain execution - - 570f425 2024-05-30T12:59:43-04:00 Log election results in writerlease - - b02e3b4 2024-05-30T12:59:43-04:00 Add Upgrade Validation force arguments for running E2E tests - - d64380b 2024-05-30T12:59:43-04:00 Add Upgrade Validation router plugin - - 0e4ed92 2024-05-30T12:59:43-04:00 Remove original condition clearing from recordIngressCondition - - bd1d0fd 2024-05-30T12:59:43-04:00 Fix recordIngressCondition changed=false issue. - - c3ae98a 2024-05-30T12:57:15-04:00 Bump openshift/api - - 6c4694d 2024-05-22T16:36:24-04:00 Regenerate certs for unit tests - - edc1fb6 2024-05-22T16:36:24-04:00 Add .gitleaks.toml - -- service-ca-operator image-amd64 f5972cc74670c274bdc2b29d0903c4ed0432b9ca to 19f312e96bb4e5b7da9f61ea4cab202b227a60c6 - - cc99940 2024-05-30T09:44:14+00:00 set required-scc for openshift workloads - -- ovn-kubernetes image-arm64 ab921c76ce6df598c47ba659fa2725382c9a5958 to 0f17c7b6e5d1c0139d05123d310c6aaff30a3e49 - - dac7382 2024-05-02T10:14:18+02:00 Put conntrack flushing for external gateway in a single function, add ipv6 MAC resolution support, cleanup conntrack for all protocols. Update e2es to expect the same behaviour for both protocols, now should also work in an ipv6-only cluster. - - ab2840d 2024-05-02T10:14:18+02:00 Fix external gateway tests for IPv6 +- ovn-kubernetes image-arm64 0f17c7b6e5d1c0139d05123d310c6aaff30a3e49 to 29f1b8aff950b2cb670aa14edb0a181530f2ba53 + - 41ab865 2024-05-21T14:09:38+01:00 Add logic to unfurl Aggregate type error in IsSuppressedError function + - 7b93ecd 2024-05-21T14:07:34+01:00 Node delete should not retry when no node-subnets exist diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index b5b069ae5b..d0ce55c275 100644 --- 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 4f2955c7c90cd1 https://github.com/openshift/csi-external-snapshotter image-arm64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 https://github.com/openshift/router image-arm64 dc38fbd84dfbed3a897f2d36b469d0ccfd1ecda3 https://github.com/openshift/kube-rbac-proxy image-arm64 e8e8c84bcc6d4419970726f3028df4b178c0b1c9 -https://github.com/openshift/ovn-kubernetes image-arm64 0f17c7b6e5d1c0139d05123d310c6aaff30a3e49 +https://github.com/openshift/ovn-kubernetes image-arm64 29f1b8aff950b2cb670aa14edb0a181530f2ba53 https://github.com/openshift/kubernetes image-arm64 a2c84a5418d02fbb0230fa10ade3e3c3d093f891 https://github.com/openshift/service-ca-operator image-arm64 19f312e96bb4e5b7da9f61ea4cab202b227a60c6 From 3ab9ec839d145d283845c5e5059216408f526eb9 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 10 Jun 2024 04:13:42 +0000 Subject: [PATCH 3/4] update manifests --- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- assets/release/release-aarch64.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index c0ae2d2ede..d573bdaf8b 100644 --- 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-06-06-210449" + "base": "4.15.0-0.nightly-arm64-2024-06-07-063811" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0db10cfa246723ba0dfcb720a6546a45a7f5edac184c16e4701b9d37e923cfc", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 903519f861..d1acef863e 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.15.0-0.nightly-arm64-2024-06-06-210449" + "base": "4.15.0-0.nightly-arm64-2024-06-07-063811" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48f70304396743800e104d711d66f87f6ebad20ce16f2e51ba4678a76e986fa5", @@ -8,7 +8,7 @@ "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0b70de6ef3fa69196f8339df6ab139ca67deae411d7b9edf2860a6a7a250e25", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e537e2bc43473025cca81650212a03fde7662a25dcd938614df0ac277936fe4", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7218674fa46a7a0ae491a0ac054e1e7b285fea14ea491b165015a6760904490", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9e85e4bfc4a311d2778119c33a8b08a052c41e7632a21578a586fe25e14c8641", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3ffdcb70eeeeed5ff09786bd289470f82d907247a9c8ff746f3c1a003193ffa", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b952409c6f6db07128d0a42209c2b4d0d3adca46f73d7db46dcc8f45b2018260", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", From 46ca82cab5ee16efd158bedb187ae2f4743e5c61 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 10 Jun 2024 04:13:45 +0000 Subject: [PATCH 4/4] update buildfiles --- Makefile.version.aarch64.var | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index f8a643f580..70e863ed47 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-arm64-2024-06-06-210449 +OCP_VERSION := 4.15.0-0.nightly-arm64-2024-06-07-063811