Skip to content

Commit

Permalink
ci(e2e): run K8S_MIN_VERSION tests on arm64
Browse files Browse the repository at this point in the history
We have a lot of arm runners and starve amd runners.
We have very high trust in our arm support so comparing
amd and arm on the same test suite is a little wasteful.

We therefore only run e2e tests on old versions of k8s
on arm64 this removes a few entries in the matrix and
improve utilization of arm runners

Also move large e2e tests to arm64

Signed-off-by: Charly Molter <[email protected]>
  • Loading branch information
lahabana committed Sep 25, 2024
1 parent 9c5165b commit 96b2396
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,29 +51,28 @@ jobs:
"test_e2e": {
"target": [""],
"k8sVersion": ["kindIpv6", "${{ env.K8S_MIN_VERSION }}", "${{ env.K8S_MAX_VERSION }}"],
"arch": ["amd64"],
"arch": ["arm64"],
"parallelism": [4],
"cniNetworkPlugin": ["flannel"],
"sidecarContainers": [""]
},
"test_e2e_env": {
"target": ["kubernetes", "universal", "multizone"],
"k8sVersion": ["kind", "kindIpv6", "${{ env.K8S_MIN_VERSION }}", "${{ env.K8S_MAX_VERSION }}"],
"k8sVersion": ["kind", "kindIpv6", "${{ env.K8S_MAX_VERSION }}"],
"arch": ["amd64"],
"parallelism": [1],
"cniNetworkPlugin": ["flannel"],
"sidecarContainers": [""],
"exclude":[
{"target": "kubernetes", "k8sVersion":"kind"},
{"target": "multizone", "k8sVersion":"kind"},
{"target":"universal", "k8sVersion":"${{ env.K8S_MIN_VERSION }}"},
{"target":"universal", "k8sVersion":"${{ env.K8S_MAX_VERSION }}"}
],
"include":[
{"sidecarContainers": "sidecarContainers", "k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "kubernetes", "arch": "amd64"},
{"k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "multizone", "arch": "arm64"},
{"k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "kubernetes", "arch": "arm64"},
{"k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "universal", "arch": "arm64"},
{"k8sVersion": "${{ env.K8S_MIN_VERSION }}", "target": "multizone", "arch": "arm64"},
{"k8sVersion": "${{ env.K8S_MIN_VERSION }}", "target": "kubernetes", "arch": "arm64"},
{"k8sVersion": "kind", "target": "universal", "arch": "arm64"},
{"k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "gatewayapi", "arch": "amd64"},
{"cniNetworkPlugin": "calico", "k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "multizone", "arch": "amd64"}
]
Expand Down
1 change: 0 additions & 1 deletion test/e2e/zoneegress/externalservices/e2e_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ func TestE2E(t *testing.T) {
test.RunE2ESpecs(t, "E2E ZoneEgress for ExternalServices Suite")
}

// arm-not-supported because of https://github.com/kumahq/kuma/issues/4822
var _ = Describe("Test ZoneEgress for External Services in Hybrid Multizone", Label("job-1"), externalservices.HybridUniversalGlobal, Ordered)

0 comments on commit 96b2396

Please sign in to comment.