multi kind test 8

banzaicloud · Jul 25, 2023 · fbf9a91 · fbf9a91
1 parent ef7eacd
commit fbf9a91
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml
@@ -9,6 +9,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    permissions:
+      checks: write
+      pull-requests: write
 
     steps:
       - name: Set up Go
@@ -46,10 +49,12 @@ jobs:
           kind_cluster_name: kind3
           kind_k8s_version: v1.23.13
 
-      - name: run tests
+      - name: Run E2E tests
         env:
            KUBECONFIG: ${{ steps.setup-kind.outputs.kubeconfig }}
            TEST_STRATEGY: complete
+           MAX_TIMEOUT: "30m"
+
 
         run: |
           go work init
@@ -60,7 +65,6 @@ jobs:
         uses: EnricoMi/publish-unit-test-result-action/composite@master
         if: always()
         with:
-          json_file: e2e_result.json
           commit: ${{ github.event.workflow_run.head_sha }}
           report_individual_runs: "true"
           check_name: "E2E test report"

diff --git a/tests/e2e/pkg/tests/tests.go b/tests/e2e/pkg/tests/tests.go
@@ -360,15 +360,19 @@ func newK8sClusterInfo(kubectlOptions k8s.KubectlOptions) (K8sClusterInfo, error
 	// TODO (marbarta): placeholder to get retrieve cluster information from kubeconfig
 	version, err := k8s.GetKubernetesClusterVersionWithOptionsE(GinkgoT(), &kubectlOptions)
 	if err != nil {
-		return K8sClusterInfo{}, err
+		return K8sClusterInfo{}, fmt.Errorf("could not get K8s cluster version: %w", err)
 	}
 	kubeSystemNS, err := k8s.GetNamespaceE(GinkgoT(), &kubectlOptions, "kube-system")
 	if err != nil {
-		return K8sClusterInfo{}, err
+		return K8sClusterInfo{}, fmt.Errorf("could not get K8s cluster UUID: %w", err)
+	}
+	nodes, err := k8s.GetNodesE(GinkgoT(), &kubectlOptions)
+	if err != nil {
+		return K8sClusterInfo{}, fmt.Errorf("could not get K8s cluster node count: %w", err)
 	}
 
 	return K8sClusterInfo{
-		workerCount: 3,
+		workerCount: len(nodes),
 		multiAZ:     false,
 		clusterID:   string(kubeSystemNS.UID),
 		provider:    "testProvider",

diff --git a/tests/e2e/test_install.go b/tests/e2e/test_install.go
@@ -24,7 +24,7 @@ import (
 )
 
 var testCaseInstall = tests.TestCase{
-	TestDuration: 7 * time.Minute,
+	TestDuration: 4 * time.Minute,
 	TestName:     "Install TestCase",
 	TestFn:       testInstall,
 }