ci: optimize e2e test workflow

Signed-off-by: Lin Yang <[email protected]>
flomesh-io · Jan 7, 2025 · 53594eb · 53594eb
1 parent 8f9c351
commit 53594eb
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -181,15 +181,18 @@ jobs:
         k8s_version: [""]
         focus: [""]
         bucket: [1, 2, 3, 4, 5]
+        tier: [1, 2]
         os: [ubuntu-22.04]
         include:
           - k8s_version: v1.19.16-k3s1
             focus: "Test traffic flowing from client to server with a Kubernetes Service for the Source: HTTP"
             bucket: ".*"
+            tier: ".*"
             os: ubuntu-20.04
           - k8s_version: v1.27.16-k3s1
             focus: "Test traffic flowing from client to server with a Kubernetes Service for the Source: HTTP"
             bucket: ".*"
+            tier: ".*"
             os: ubuntu-22.04
     runs-on: ${{ matrix.os }}
     env:
@@ -224,7 +227,7 @@ jobs:
         run: |
           export PATH=$PWD/bin:$PATH
           echo "PATH=$PATH"
-          go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -installType=${{ env.CLUSTER_INSTALL_TYPE }} -clusterVersion='${{ matrix.k8s_version }}' -test.timeout 0 -test.failfast -ginkgo.failFast -ginkgo.focus='\[Bucket ${{ matrix.bucket }}\].*${{ matrix.focus }}'
+          go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -installType=${{ env.CLUSTER_INSTALL_TYPE }} -clusterVersion='${{ matrix.k8s_version }}' -test.timeout 0 -test.failfast -ginkgo.failFast -ginkgo.focus='\[Tier ${{ matrix.tier }}\]\[Bucket ${{ matrix.bucket }}\].*${{ matrix.focus }}'
         continue-on-error: true
       - name: Set Logs name
         if: ${{ steps.test.conclusion != 'skipped' }}
@@ -253,7 +256,7 @@ jobs:
     strategy:
       matrix:
         focus: [ "" ]
-        bucket: [ 6, 7 ]
+        bucket: [ 6 ]
         k8s:
           - version: "latest"
             os: ubuntu-22.04
@@ -263,6 +266,12 @@ jobs:
             os: ubuntu-22.04
           - version: v1.23.17-k3s1
             os: ubuntu-22.04
+        include:
+          - focus: ""
+            bucket: "7"
+            k8s:
+              - version: "latest"
+                os: ubuntu-22.04
     runs-on: ${{ matrix.k8s.os }}
     env:
       CTR_TAG: ${{ github.sha }}