From a939e033bfe041e3c280b9b21a47ab7dacae9156 Mon Sep 17 00:00:00 2001 From: Cecile Robert-Michon Date: Thu, 5 Oct 2023 19:13:52 +0000 Subject: [PATCH] use ipv6/dual stack conf file --- test/e2e/conformance_test.go | 2 ++ test/e2e/data/kubetest/conformance-ipv6-ginkgo-v2.yaml | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 test/e2e/data/kubetest/conformance-ipv6-ginkgo-v2.yaml diff --git a/test/e2e/conformance_test.go b/test/e2e/conformance_test.go index e7ecb60186c..b270e35e475 100644 --- a/test/e2e/conformance_test.go +++ b/test/e2e/conformance_test.go @@ -121,8 +121,10 @@ var _ = Describe("Conformance Tests", func() { // use the ipv6 flavor if ipv6 IP family is specified. if e2eConfig.GetVariable(capi_e2e.IPFamily) == "IPv6" { flavor += "-ipv6" + kubetestConfigFilePath = strings.Replace(kubetestConfigFilePath, ".yaml", "-ipv6.yaml", 1) } else if e2eConfig.GetVariable(capi_e2e.IPFamily) == "dual" { flavor += "-dual-stack" + kubetestConfigFilePath = strings.Replace(kubetestConfigFilePath, ".yaml", "-dual-stack.yaml", 1) } // Starting with Kubernetes v1.25, the kubetest config file needs to be compatible with Ginkgo V2. diff --git a/test/e2e/data/kubetest/conformance-ipv6-ginkgo-v2.yaml b/test/e2e/data/kubetest/conformance-ipv6-ginkgo-v2.yaml new file mode 100644 index 00000000000..e0c72c864fe --- /dev/null +++ b/test/e2e/data/kubetest/conformance-ipv6-ginkgo-v2.yaml @@ -0,0 +1,8 @@ +ginkgo.focus: \[Feature:Networking-IPv6\]|\[Conformance\] +ginkgo.skip: \[Slow\]|\[Serial\]|\[Flaky\]|\[Feature:SCTPConnectivity\]|Should.recreate.evicted.statefulset|HostPort.validates.that.there.is.no.conflict.between.pods.with.same.hostPort.but.different.hostIP.and.protocol|should.have.ipv4.and.ipv6.node.podCIDRs +disable-log-dump: true +ginkgo.progress: true +ginkgo.slow-spec-threshold: 120s +ginkgo.trace: true +ginkgo.v: true +ginkgo.timeout: 3h