chore(ci): tests are not properly distributed across workers (#3813)

kumahq · Feb 11, 2022 · 44028ce · 44028ce
1 parent b9704a1
commit 44028ce
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -855,7 +855,7 @@ jobs:
             - run:
                 name: "Run IPv6 E2E tests"
                 command: |
-                  export E2E_PKG_LIST=$(circleci tests glob ./test/e2e/* | circleci tests split --total=$(ls test/e2e | wc -l) | xargs printf "./%s/... ")
+                  export E2E_PKG_LIST=$(circleci tests glob ./test/e2e/* | circleci tests split | xargs printf "./%s/... ")
                   export API_VERSION=<< parameters.api >>
                   export IPV6=true
                   export KUMA_DEFAULT_RETRIES=60
@@ -871,7 +871,7 @@ jobs:
                 name: "Run IPv4 E2E tests"
                 command: |
                   export CI_K3S_VERSION=<< parameters.k3sVersion >>
-                  export E2E_PKG_LIST=$(circleci tests glob ./test/e2e/* | circleci tests split --total=$(ls test/e2e | wc -l) | xargs printf "./%s/... ")
+                  export E2E_PKG_LIST=$(circleci tests glob ./test/e2e/* | circleci tests split | xargs printf "./%s/... ")
                   export API_VERSION=<< parameters.api >>
                   export GINKGO_XUNIT_RESULTS_DIR=/tmp/xunit
                   export K3D=true

diff --git a/test/e2e/inspect/inspect_k8s_multizone.go b/test/e2e/inspect/inspect_k8s_multizone.go
@@ -16,7 +16,6 @@ import (
 func KubernetesMultizone() {
 	var globalK8s, zoneK8s *K8sCluster
 	var zoneIngress *kube_core.Pod
-	var kumaControlPlane *kube_core.Pod
 
 	meshMTLSOn := func(mesh string) string {
 		return fmt.Sprintf(`
@@ -85,7 +84,6 @@ spec:
 		}, "60s", "1s").Should(Succeed())
 
 		zoneIngress = GetPod(Config.KumaNamespace, "kuma-ingress")
-		kumaControlPlane = GetPod(Config.KumaNamespace, Config.KumaServiceName)
 	})
 
 	E2EAfterEach(func() {
@@ -99,9 +97,7 @@ spec:
 
 	It("should return envoy config_dump for zone ingress", func() {
 		zoneIngressName := fmt.Sprintf("%s.%s", zoneIngress.GetName(), Config.KumaNamespace)
-		cmd := []string{"kumactl", "inspect", "zoneingress", zoneIngressName, "--config-dump"}
-
-		stdout, _, err := zoneK8s.ExecWithRetries(Config.KumaNamespace, kumaControlPlane.GetName(), "control-plane", cmd...)
+		stdout, err := zoneK8s.GetKumactlOptions().RunKumactlAndGetOutput("inspect", "zoneingress", zoneIngressName, "--config-dump")
 		Expect(err).ToNot(HaveOccurred())
 
 		Expect(stdout).To(ContainSubstring(`"dataplane.proxyType": "ingress"`))

diff --git a/test/e2e/inspect/inspect_k8s_standalone.go b/test/e2e/inspect/inspect_k8s_standalone.go
@@ -16,7 +16,6 @@ import (
 func KubernetesStandalone() {
 	var cluster *K8sCluster
 	var demoClient *kube_core.Pod
-	var kumaControlPlane *kube_core.Pod
 
 	GetPod := func(namespace, app string) *kube_core.Pod {
 		pods, err := k8s.ListPodsE(
@@ -56,7 +55,6 @@ func KubernetesStandalone() {
 		}, "60s", "1s").Should(Succeed())
 
 		demoClient = GetPod(TestNamespace, "demo-client")
-		kumaControlPlane = GetPod(Config.KumaNamespace, Config.KumaServiceName)
 	})
 
 	E2EAfterEach(func() {
@@ -67,9 +65,7 @@ func KubernetesStandalone() {
 
 	It("should return envoy config_dump", func() {
 		dataplaneName := fmt.Sprintf("%s.%s", demoClient.GetName(), TestNamespace)
-		cmd := []string{"kumactl", "inspect", "dataplane", dataplaneName, "--config-dump"}
-
-		stdout, _, err := cluster.ExecWithRetries(Config.KumaNamespace, kumaControlPlane.GetName(), "control-plane", cmd...)
+		stdout, err := cluster.GetKumactlOptions().RunKumactlAndGetOutput("inspect", "dataplane", dataplaneName, "--config-dump")
 		Expect(err).ToNot(HaveOccurred())
 
 		Expect(stdout).To(ContainSubstring(`"name": "demo-client_kuma-test_svc"`))