[apisix-ingress-controller] branch master updated: ci: regression test on apisix-and-all and apisix (#1726)

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
     new f1395f11 ci: regression test on apisix-and-all and apisix (#1726)
f1395f11 is described below

commit f1395f11af09fc8ecffea68500bb1e13518e78e8
Author: Xin Rong <al...@gmail.com>
AuthorDate: Fri Mar 17 17:03:59 2023 +0800

    ci: regression test on apisix-and-all and apisix (#1726)
---
 .github/workflows/e2e-test-ci.yml | 2 ++
 test/e2e/scaffold/scaffold.go     | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e-test-ci.yml b/.github/workflows/e2e-test-ci.yml
index 3e152668..b68e03ce 100644
--- 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
index 9052e113..bd35ecf4 100644
--- 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()