From 9bca80050dc460be6a93a4c18310c7e7f52a3e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Caama=C3=B1o=20Ruiz?= Date: Mon, 3 Nov 2025 17:24:47 +0000 Subject: [PATCH] OVNK BGP: test FRR 10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaime CaamaƱo Ruiz --- .../ovn/bgp/pre/baremetalds-e2e-ovn-bgp-pre-commands.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ci-operator/step-registry/baremetalds/e2e/ovn/bgp/pre/baremetalds-e2e-ovn-bgp-pre-commands.sh b/ci-operator/step-registry/baremetalds/e2e/ovn/bgp/pre/baremetalds-e2e-ovn-bgp-pre-commands.sh index f509f60deca6f..dab2378418b07 100644 --- a/ci-operator/step-registry/baremetalds/e2e/ovn/bgp/pre/baremetalds-e2e-ovn-bgp-pre-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/ovn/bgp/pre/baremetalds-e2e-ovn-bgp-pre-commands.sh @@ -277,6 +277,14 @@ until oc wait -n openshift-frr-k8s deployment frr-k8s-webhook-server --for condi sleep 5 done +# override FRR-K8s with an upstream image needed to support EVPN +oc patch Network.operator.openshift.io cluster --type=merge -p='{"spec":{"managementState": "Unmanaged"}}' +oc set image -n openshift-frr-k8s ds/frr-k8s frr=quay.io/frrouting/frr:10.4.1 reloader=quay.io/frrouting/frr:10.4.1 +echo "Waiting for daemonset 'frr-k8s' to rollout..." +until oc rollout status daemonset -n openshift-frr-k8s frr-k8s --timeout 2m &> /dev/null; do + sleep 5 +done + # set up BGP peering of the cluster with the external FRR instance container # peer is setup on the default VRF and also on each extra network VRF for network in "${!vrf_neighbors[@]}"; do