use ipv6/dual stack conf file

kubernetes-sigs · Oct 5, 2023 · a939e03 · a939e03
1 parent 3fc99f6
commit a939e03
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git 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
@@ -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