Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix backport #4205

Merged
merged 1 commit into from
Jun 22, 2024
Merged

fix backport #4205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-x86-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 2 additions & 9 deletions test/e2e/kube-ovn/underlay/underlay.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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
}, "")
Expand Down Expand Up @@ -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)
})
})
Expand Down
Loading