Skip to content

Commit

Permalink
test/K8sServices: redeploy Cilium before fragment tracking tests
Browse files Browse the repository at this point in the history
In #11602, Cilium redeployment was removed from most of the AfterAll()
steps in the tests. It could not be removed in one case in the Service
tests, because running IPv4 fragment tracking tests with the options
used to deploy Cilium in the previous test make them fail.

Deploy Cilium with a clean configuration before running the fragment
tracking tests, and remove redeployment from that AfterAll() block at
last.

Signed-off-by: Quentin Monnet <quentin@isovalent.com>
  • Loading branch information
qmonnet committed May 22, 2020
1 parent a9af784 commit 0f790cd
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions test/k8sT/Services.go
Expand Up @@ -1105,10 +1105,6 @@ var _ = Describe("K8sServicesTest", func() {

AfterAll(func() {
enableBackgroundReport = true
kubectl.DeleteCiliumDS()
ExpectAllPodsTerminated(kubectl)
// Deploy Cilium as the next test expects it to be up and running
DeployCiliumAndDNS(kubectl, ciliumFilename)
})

Context("Tests with vxlan", func() {
Expand Down Expand Up @@ -1333,6 +1329,7 @@ var _ = Describe("K8sServicesTest", func() {

// Net-next and not old versions, because of LRU requirement.
SkipItIf(helpers.DoesNotRunOnNetNextOr419Kernel, "Supports IPv4 fragments", func() {
DeployCiliumAndDNS(kubectl, ciliumFilename)
testIPv4FragmentSupport()
})
})
Expand Down

0 comments on commit 0f790cd

Please sign in to comment.