ci: regression test on apisix-and-all and apisix

apache · Mar 13, 2023 · 8dc7152 · 8dc7152
1 parent 1eec3df
commit 8dc7152
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/e2e-test-ci.yml b/.github/workflows/e2e-test-ci.yml
@@ -153,6 +153,7 @@ jobs:
       fail-fast: false # If false, GitHub will not cancels all in-progress jobs in the matrix if any matrix job fails.
       matrix:
         suite: ${{ fromJson(needs.prepare.outputs.matrix) }}
+        ingress-class-values: [ "apisix", "apisix-and-all" ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -190,6 +191,7 @@ jobs:
         env:
           E2E_FOCUS: "${{ matrix.suite }}"
           ENABLE_PROXY: "false"
+          INGRESS_CLASS: "${{ matrix.ingress-class-values }}"
           E2E_SKIP_BUILD: "1"
           E2E_FLAKE_ATTEMPTS: "2"
           E2E_ENV: "ci"

diff --git a/test/e2e/scaffold/scaffold.go b/test/e2e/scaffold/scaffold.go
@@ -165,7 +165,13 @@ func NewScaffold(o *Options) *Scaffold {
 		o.HTTPBinServicePort = 80
 	}
 	if o.IngressClass == "" {
-		o.IngressClass = config.IngressClassApisixAndAll
+		// Env acts on ci and will be deleted after the release of 1.17
+		ingClass := os.Getenv("INGRESS_CLASS")
+		if ingClass != "" {
+			o.IngressClass = ingClass
+		} else {
+			o.IngressClass = config.IngressClass
+		}
 	}
 	defer ginkgo.GinkgoRecover()