Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: optimize e2e test workflow #621

Merged
merged 3 commits into from
Jan 7, 2025
Merged

ci: optimize e2e test workflow #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ff7aac
fix: switch to tools-node to import images into k3d cluster
reaver-flomesh Jan 7, 2025
7fcb847
ci: mergify config
reaver-flomesh Jan 7, 2025
18a73a0
test: reduce the testcases for gateway with traffic interception mode…
reaver-flomesh Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,8 @@ jobs:
needs: build
strategy:
matrix:
focus: [ "" ]
bucket: [ 6, 7 ]
focus: [""]
bucket: [6, 7]
k8s:
- version: "latest"
os: ubuntu-22.04
Expand All @@ -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 }}
Expand Down
4 changes: 1 addition & 3 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/framework/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading