From 102297159c9fbbc79a8097398f1e3d28dc1759ea Mon Sep 17 00:00:00 2001 From: bobz965 Date: Fri, 21 Jun 2024 06:48:54 +0000 Subject: [PATCH] fix backport Signed-off-by: bobz965 --- .github/workflows/build-x86-image.yaml | 2 +- test/e2e/kube-ovn/underlay/underlay.go | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml index 65dc9ec1143..db860defb38 100644 --- a/.github/workflows/build-x86-image.yaml +++ b/.github/workflows/build-x86-image.yaml @@ -1720,7 +1720,7 @@ jobs: - name: Install Kube-OVN with Cilium chaining id: install - run: make kind-install-cilium-chaining-${{ matrix.mode }}-${{ matrix.ip-family }} + run: make kind-install-cilium-chaining-${{ matrix.ip-family }} - name: Run E2E id: e2e diff --git a/test/e2e/kube-ovn/underlay/underlay.go b/test/e2e/kube-ovn/underlay/underlay.go index 19a3ed96c13..0e2cc864adc 100644 --- a/test/e2e/kube-ovn/underlay/underlay.go +++ b/test/e2e/kube-ovn/underlay/underlay.go @@ -66,7 +66,7 @@ func waitSubnetStatusUpdate(subnetName string, subnetClient *framework.SubnetCli }, "") } -func waitSubnetU2OStatus(f *framework.Framework, subnetName string, subnetClient *framework.SubnetClient, enableU2O bool) { +func waitSubnetU2OStatus(subnetName string, subnetClient *framework.SubnetClient, enableU2O bool) { ginkgo.GinkgoHelper() framework.WaitUntil(1*time.Second, 3*time.Second, func(_ context.Context) (bool, error) { @@ -79,13 +79,6 @@ func waitSubnetU2OStatus(f *framework.Framework, subnetName string, subnetClient return true, nil } ginkgo.By("Keep waiting for U2O to be true: current enable U2O subnet status: U2OInterconnectionIP = " + subnet.Status.U2OInterconnectionIP + ", U2OInterconnectionVPC = " + subnet.Status.U2OInterconnectionVPC) - } else { - if subnet.Status.U2OInterconnectionIP == "" && subnet.Status.U2OInterconnectionVPC == "" { - framework.Logf("current disable U2O subnet status: U2OInterconnectionIP = %s, U2OInterconnectionVPC = %s", - subnet.Status.U2OInterconnectionIP, subnet.Status.U2OInterconnectionVPC) - return true, nil - } - ginkgo.By("Keep waiting for U2O to be false: current enable U2O subnet status: U2OInterconnectionIP = " + subnet.Status.U2OInterconnectionIP + ", U2OInterconnectionVPC = " + subnet.Status.U2OInterconnectionVPC) } return false, nil }, "") @@ -807,7 +800,7 @@ var _ = framework.SerialDescribe("[group:underlay]", func() { subnet = subnetClient.Get(subnetName) ginkgo.By("10. waiting for U2OInterconnection status of subnet " + subnetName + " to be false") - waitSubnetU2OStatus(f, subnetName, subnetClient, false) + waitSubnetU2OStatus(subnetName, subnetClient, false) checkU2OItems(f, subnet, underlayPod, overlayPod, false) }) })