try to split gateway tests to its own target

Signed-off-by: Charly Molter <[email protected]>
kumahq · Jan 11, 2024 · 259d320 · 259d320
1 parent c5f4ae6
commit 259d320
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/.github/workflows/build-test-distribute.yaml b/.github/workflows/build-test-distribute.yaml
@@ -264,13 +264,19 @@ jobs:
                   {"k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "multizone", "arch": "arm64"},
                   {"k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "kubernetes", "arch": "arm64"},
                   {"k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "universal", "arch": "arm64"},
+                  {"k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "gatewayapi", "arch": "amd64"},
                   {"cniNetworkPlugin": "calico", "k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "multizone", "arch": "amd64"}
                 ]
               }
             }
           OVERRIDE_JQ_CMD: |-
+<<<<<<< Updated upstream
             .test_e2e.k8sVersion = ["${{ env.K8S_MAX_VERSION }}"]
             | .test_e2e_env.include = []
+=======
+            .test_e2e = false
+            | .test_e2e_env.include = [{"k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "gatewayapi", "arch": "amd64"}]
+>>>>>>> Stashed changes
             | .test_e2e_env.exclude += [{"arch": "arm64"}, {"k8sVersion": "kindIpv6"}, {"k8sVersion": "${{ env.K8S_MIN_VERSION}}"}]
         run: |-
           BASE_MATRIX_ALL='${{ env.BASE_MATRIX }}'

diff --git a/mk/e2e.new.mk b/mk/e2e.new.mk
@@ -135,6 +135,15 @@ test/e2e-kubernetes: $(E2E_DEPS_TARGETS) $(E2E_K8S_BIN_DEPS) ## Run kubernetes e
 	$(E2E_ENV_VARS) $(GINKGO_TEST_E2E) $(KUBE_E2E_PKG_LIST) || (ret=$$?; $(MAKE) test/e2e/k8s/stop/cluster/kuma-1 && exit $$ret)
 	$(MAKE) test/e2e/k8s/stop
 
+.PHONY: test/e2e-gatewayapi
+test/e2e-gatewayapi: $(E2E_DEPS_TARGETS) $(E2E_K8S_BIN_DEPS) ## Run kubernetes e2e tests. Use DEBUG=1 to more easily find issues
+	$(MAKE) docker/tag
+	$(MAKE) test/e2e/k8s/start/cluster/kuma-1
+	$(MAKE) test/e2e/k8s/wait/kuma-1
+	$(MAKE) test/e2e/k8s/load/images/kuma-1
+	$(E2E_ENV_VARS) $(GINKGO_TEST_E2E) ./test/e2e_env/gatewayapi || (ret=$$?; $(MAKE) test/e2e/k8s/stop/cluster/kuma-1 && exit $$ret)
+	$(MAKE) test/e2e/k8s/stop/cluster/kuma-1
+
 .PHONY: test/e2e-universal
 test/e2e-universal: $(E2E_DEPS_TARGETS) $(E2E_UNIVERSAL_BIN_DEPS) k3d/network/create ## Run universal e2e tests. Use DEBUG=1 to more easily find issues
 	$(MAKE) docker/tag/test

diff --git a/test/e2e/gateway/e2e_suite_test.go b/test/e2e/gateway/e2e_suite_test.go
diff --git a/...2e/gateway/gatewayapi/conformance_test.go → test/e2e_env/gatewayapi/conformance_test.go b/...2e/gateway/gatewayapi/conformance_test.go → test/e2e_env/gatewayapi/conformance_test.go
@@ -1,7 +1,6 @@
 package gatewayapi_test
 
 import (
-	"os"
 	"testing"
 
 	"github.com/gruntwork-io/terratest/modules/k8s"
@@ -35,10 +34,6 @@ var implementation = conformanceapis.Implementation{
 // TestConformance runs as a `testing` test and not Ginkgo so we have to use an
 // explicit `g` to use Gomega.
 func TestConformance(t *testing.T) {
-	// this is like job-0
-	if os.Getenv("CIRCLE_NODE_INDEX") != "" && os.Getenv("CIRCLE_NODE_INDEX") != "0" {
-		t.Skip("Conformance tests are only run on job 0")
-	}
 	if Config.IPV6 {
 		t.Skip("On IPv6 we run on kind which doesn't support load balancers")
 	}

diff --git a/...teway/gatewayapi/gatewayapi_suite_test.go → ...e_env/gatewayapi/gatewayapi_suite_test.go b/...teway/gatewayapi/gatewayapi_suite_test.go → ...e_env/gatewayapi/gatewayapi_suite_test.go