Merge pull request #656 from alexander-demicev/fixe2eruns

Fix suite path in e2e setup
rancher · Aug 9, 2024 · 4d74097 · 4d74097
2 parents 2abd5a6 + 8b27c19
commit 4d74097
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/e2e-long.yaml b/.github/workflows/e2e-long.yaml
@@ -11,7 +11,7 @@ jobs:
   e2e_import_gitops:
     uses: ./.github/workflows/run-e2e-suite.yaml
     with:
-      test_suite: $(pwd)/test/e2e/suites/import-gitops
+      test_suite: test/e2e/suites/import-gitops
       test_name: Import via GitOps
       run_azure_janitor: false
       artifact_name: artifacts_import_gitops
@@ -20,7 +20,7 @@ jobs:
   e2e_import_gitops_v3:
     uses: ./.github/workflows/run-e2e-suite.yaml
     with:
-      test_suite: $(pwd)/test/e2e/suites/import-gitops-v3
+      test_suite: test/e2e/suites/import-gitops-v3
       test_name: Import via GitOps [v3]
       run_azure_janitor: false
       artifact_name: artifacts_import_gitops_v3
@@ -29,7 +29,7 @@ jobs:
   e2e_v2prov:
     uses: ./.github/workflows/run-e2e-suite.yaml
     with:
-      test_suite: $(pwd)/test/e2e/suites/v2prov
+      test_suite: test/e2e/suites/v2prov
       test_name: v2 provisioning
       run_azure_janitor: true
       artifact_name: artifacts_v2prov
@@ -38,7 +38,7 @@ jobs:
   e2e_update_labels:
     uses: ./.github/workflows/run-e2e-suite.yaml
     with:
-      test_suite: $(pwd)/test/e2e/suites/update-labels
+      test_suite: test/e2e/suites/update-labels
       test_name: Update labels
       run_azure_janitor: true
       artifact_name: artifacts_update_labels
@@ -47,7 +47,7 @@ jobs:
   e2e_embedded_capi_disabled:
     uses: ./.github/workflows/run-e2e-suite.yaml
     with:
-      test_suite: $(pwd)/test/e2e/suites/embedded-capi-disabled
+      test_suite: test/e2e/suites/embedded-capi-disabled
       test_name: Embedded CAPI disabled
       run_azure_janitor: false
       artifact_name: artifacts_embedded_capi
@@ -56,7 +56,7 @@ jobs:
   e2e_embedded_capi_disabled_v3:
     uses: ./.github/workflows/run-e2e-suite.yaml
     with:
-      test_suite: $(pwd)/test/e2e/suites/embedded-capi-disabled-v3
+      test_suite: test/e2e/suites/embedded-capi-disabled-v3
       test_name: Embedded CAPI disabled [v3]
       run_azure_janitor: false
       artifact_name: artifacts_embedded_capi_v3

diff --git a/.github/workflows/run-e2e-suite.yaml b/.github/workflows/run-e2e-suite.yaml
@@ -45,7 +45,7 @@ env:
   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 }}
+  GINKGO_TESTS: ${{ github.workspace }}/${{ inputs.test_suite }}
 
 jobs:
   run_e2e_tests: