ci: optimize e2e test workflow (#621)

* fix: switch to tools-node to import images into k3d cluster Signed-off-by: Lin Yang <[email protected]> * ci: mergify config Signed-off-by: Lin Yang <[email protected]> * test: reduce the testcases for gateway with traffic interception mode NodeLevel Signed-off-by: Lin Yang <[email protected]> --------- Signed-off-by: Lin Yang <[email protected]>
flomesh-io · Jan 7, 2025 · db70296 · db70296
1 parent 234a063
commit db70296
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -252,8 +252,8 @@ jobs:
     needs: build
     strategy:
       matrix:
-        focus: [ "" ]
-        bucket: [ 6, 7 ]
+        focus: [""]
+        bucket: [6, 7]
         k8s:
           - version: "latest"
             os: ubuntu-22.04
@@ -263,6 +263,17 @@ jobs:
             os: ubuntu-22.04
           - version: v1.23.17-k3s1
             os: ubuntu-22.04
+        exclude:
+          - focus: ""
+            bucket: "7"
+            k8s:
+              version: v1.21.14-k3s1
+              os: ubuntu-22.04
+          - focus: ""
+            bucket: "7"
+            k8s:
+              version: v1.23.17-k3s1
+              os: ubuntu-22.04
     runs-on: ${{ matrix.k8s.os }}
     env:
       CTR_TAG: ${{ github.sha }}

diff --git a/.mergify.yml b/.mergify.yml
@@ -23,12 +23,10 @@ pull_request_rules:
       - check-success=Go mesh test e2e (v1.27.16-k3s1, Test traffic flowing from client to server with a Kubernetes Ser...
       - check-success=Go gateway test e2e (6, latest, ubuntu-22.04)
       - check-success=Go gateway test e2e (6, v1.19.16-k3s1, ubuntu-20.04)
-      - check-success=Go gateway test e2e (6, v1.21.16-k3s1, ubuntu-22.04)
+      - check-success=Go gateway test e2e (6, v1.21.14-k3s1, ubuntu-22.04)
       - check-success=Go gateway test e2e (6, v1.23.17-k3s1, ubuntu-22.04)
       - check-success=Go gateway test e2e (7, latest, ubuntu-22.04)
       - check-success=Go gateway test e2e (7, v1.19.16-k3s1, ubuntu-20.04)
-      - check-success=Go gateway test e2e (7, v1.21.16-k3s1, ubuntu-22.04)
-      - check-success=Go gateway test e2e (7, v1.23.17-k3s1, ubuntu-22.04)
       - check-success=Go statefulset test e2e (8)
       - check-success=Go retry test e2e (9)
       - check-success=Go ingress test e2e (10)

diff --git a/tests/framework/common.go b/tests/framework/common.go
@@ -682,7 +682,7 @@ func (td *FsmTestData) LoadImagesToK3d(imageNames []string) error {
 	}
 
 	td.T.Logf("Importing image(s) into cluster '%s'", td.ClusterName)
-	loadImageOpts := k3d.ImageImportOpts{KeepTar: false, KeepToolsNode: false, Mode: k3d.ImportModeDirect}
+	loadImageOpts := k3d.ImageImportOpts{KeepTar: false, KeepToolsNode: false, Mode: k3d.ImportModeToolsNode}
 	if err := k3dClient.ImageImportIntoClusterMulti(context.TODO(), runtimes.SelectedRuntime, images, kc, loadImageOpts); err != nil {
 		td.T.Errorf("Failed to import image(s) into cluster '%s': %+v", td.ClusterName, err)
 		return err