Use new configuration in e2e workflows

Signed-off-by: Alexandr Demicev <alexandr.demicev@suse.com>
rancher · Aug 6, 2024 · f1a63ca · f1a63ca
1 parent 792e3b0
commit f1a63ca
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/.github/workflows/e2e-long.yaml b/.github/workflows/e2e-long.yaml
@@ -15,7 +15,7 @@ jobs:
       test_name: Import via GitOps
       run_azure_janitor: false
       artifact_name: artifacts_import_gitops
-      use_eks: true
+      management_cluster_infrastructure: eks
     secrets: inherit
   e2e_import_gitops_v3:
     uses: ./.github/workflows/run-e2e-suite.yaml
@@ -24,7 +24,7 @@ jobs:
       test_name: Import via GitOps [v3]
       run_azure_janitor: false
       artifact_name: artifacts_import_gitops_v3
-      use_eks: true
+      management_cluster_infrastructure: eks
     secrets: inherit
   e2e_v2prov:
     uses: ./.github/workflows/run-e2e-suite.yaml
@@ -33,7 +33,7 @@ jobs:
       test_name: v2 provisioning
       run_azure_janitor: true
       artifact_name: artifacts_v2prov
-      use_eks: true
+      management_cluster_infrastructure: eks
     secrets: inherit
   e2e_update_labels:
     uses: ./.github/workflows/run-e2e-suite.yaml
@@ -42,7 +42,7 @@ jobs:
       test_name: Update labels
       run_azure_janitor: true
       artifact_name: artifacts_update_labels
-      use_eks: true
+      management_cluster_infrastructure: eks
     secrets: inherit
   e2e_embedded_capi_disabled:
     uses: ./.github/workflows/run-e2e-suite.yaml
@@ -51,7 +51,7 @@ jobs:
       test_name: Embedded CAPI disabled
       run_azure_janitor: false
       artifact_name: artifacts_embedded_capi
-      use_eks: true
+      management_cluster_infrastructure: eks
     secrets: inherit
   e2e_embedded_capi_disabled_v3:
     uses: ./.github/workflows/run-e2e-suite.yaml
@@ -60,5 +60,5 @@ jobs:
       test_name: Embedded CAPI disabled [v3]
       run_azure_janitor: false
       artifact_name: artifacts_embedded_capi_v3
-      use_eks: true
+      management_cluster_infrastructure: eks
     secrets: inherit
diff --git a/.github/workflows/e2e-short-test.yaml b/.github/workflows/e2e-short-test.yaml
@@ -3,6 +3,10 @@ name: Run short e2e tests (with runner)
 on:
   workflow_dispatch:
 
+env:
+  MANAGEMENT_CLUSTER_INFRASTRUCTURE: "isolated-kind"
+  GINKGO_LABEL_FILTER: "short"
+
 jobs:
   e2e:
     runs-on: org--rancher--amd64-containers
@@ -17,7 +21,7 @@ jobs:
         with:
           go-version: "=1.22.0"
       - name: Run e2e tests
-        run: ISOLATED_MODE=true  USE_EKS=false GINKGO_LABEL_FILTER=short make test-e2e
+        run: make test-e2e
       - name: Collect run artifacts
         if: always()
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/e2e-short.yaml b/.github/workflows/e2e-short.yaml
@@ -4,6 +4,10 @@ on:
   pull_request:
     types: [opened, edited, synchronize, reopened, labeled, unlabeled]
 
+env:
+  MANAGEMENT_CLUSTER_INFRASTRUCTURE: "isolated-kind"
+  GINKGO_LABEL_FILTER: "short"
+
 jobs:
   e2e:
     runs-on: ubuntu-latest
@@ -34,7 +38,7 @@ jobs:
         with:
           go-version: "=1.22.0"
       - name: Run e2e tests
-        run: ISOLATED_MODE=true  USE_EKS=false GINKGO_LABEL_FILTER=short make test-e2e
+        run: make test-e2e
       - name: Collect run artifacts
         if: always()
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/run-e2e-suite.yaml b/.github/workflows/run-e2e-suite.yaml
@@ -1,6 +1,11 @@
 on:
   workflow_call:
     inputs:
+      management_cluster_infrastructure:
+        description: "The infrastructure to use for the management cluster: eks, kind or isolated-kind"
+        type: string
+        required: true
+        default: "eks"
       test_suite:
         description: "The test suite to run (i.e. path to it)"
         required: true
@@ -18,10 +23,6 @@ on:
         required: false
         default: false
         type: boolean
-      use_eks:
-        description: "Use EKS for the management cluster"
-        required: true
-        type: boolean
 
 permissions:
   contents: read
@@ -42,6 +43,9 @@ env:
   AWS_REGION: eu-west-2
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  MANAGEMENT_CLUSTER_INFRASTRUCTURE: ${{ inputs.management_cluster_infrastructure }}
+  GINKGO_LABEL_FILTER: full 
+  GINKGO_TESTS: ${{ inputs.test_suite }}
 
 jobs:
   run_e2e_tests:
@@ -80,10 +84,10 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: build and push e2e image
-        if: ${{ inputs.use_eks }}
+        if: ${{ inputs.management_cluster_infrastructure == 'eks' }}
         run: make e2e-image-push
       - name: Run e2e tests
-        run: GINKGO_LABEL_FILTER=full USE_EKS=${{ inputs.use_eks }} GINKGO_TESTS=${{ inputs.test_suite }} make test-e2e
+        run: make test-e2e
       - name: Collect run artifacts
         if: always()
         uses: actions/upload-artifact@v4