Merge pull request #72092 from vllry/move-gce-test-manifests

test/e2e/framework/ingress/ingress_utils.go

@@ -86,6 +86,9 @@ const (
 	// IngressManifestPath is the parent path to yaml test manifests.
 	IngressManifestPath = "test/e2e/testing-manifests/ingress"
 
+	// GCEIngressManifestPath is the parent path to GCE-specific yaml test manifests.
+	GCEIngressManifestPath = IngressManifestPath + "/gce"
+
 	// IngressReqTimeout is the timeout on a single http request.
 	IngressReqTimeout = 10 * time.Second
 

test/e2e/network/ingress.go

@@ -904,7 +904,7 @@ var _ = SIGDescribe("Loadbalancing: L7", func() {
 		It("single and multi-cluster ingresses should be able to exist together", func() {
 			By("Creating a single cluster ingress first")
 			jig.Class = ""
-			singleIngFilePath := filepath.Join(ingress.IngressManifestPath, "static-ip-2")
+			singleIngFilePath := filepath.Join(ingress.GCEIngressManifestPath, "static-ip-2")
 			jig.CreateIngress(singleIngFilePath, ns, map[string]string{}, map[string]string{})
 			jig.WaitForIngress(false /*waitForNodePort*/)
 			// jig.Ingress will be overwritten when we create MCI, so keep a reference.

test/e2e/upgrades/ingress.go

@@ -98,7 +98,7 @@ func (t *IngressUpgradeTest) Setup(f *framework.Framework) {
 
 	// Create a working basic Ingress
 	ginkgo.By(fmt.Sprintf("allocated static ip %v: %v through the GCE cloud provider", t.ipName, t.ip))
-	jig.CreateIngress(filepath.Join(ingress.IngressManifestPath, "static-ip-2"), ns.Name, map[string]string{
+	jig.CreateIngress(filepath.Join(ingress.GCEIngressManifestPath, "static-ip-2"), ns.Name, map[string]string{
 		ingress.IngressStaticIPKey:  t.ipName,
 		ingress.IngressAllowHTTPKey: "false",
 	}, map[string]string{})