fix paths to all tests

nebari-dev · Jul 26, 2023 · 0a2e7a7 · 0a2e7a7
1 parent 4fc1d85
commit 0a2e7a7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 21 deletions.
diff --git a/.github/workflows/kubernetes_test.yaml b/.github/workflows/kubernetes_test.yaml
@@ -5,8 +5,6 @@ on:
     paths:
       - ".github/workflows/kubernetes_test.yaml"
       - "tests/**"
-      - "tests_deployment/**"
-      - "tests_e2e/**"
       - "scripts/**"
       - "src/**"
       - "pyproject.toml"
@@ -19,8 +17,6 @@ on:
     paths:
       - ".github/workflows/kubernetes_test.yaml"
       - "tests/**"
-      - "tests_deployment/**"
-      - "tests_e2e/**"
       - "scripts/**"
       - "src/**"
       - "pyproject.toml"
@@ -148,14 +144,14 @@ jobs:
         env:
           CYPRESS_BASE_URL: https://github-actions.nebari.dev/
         with:
-          working-directory: tests_e2e
+          working-directory: tests/tests_e2e
 
       - name: Playwright Tests
         env:
           KEYCLOAK_USERNAME: ${{ env.CYPRESS_EXAMPLE_USER_NAME }}
           KEYCLOAK_PASSWORD: ${{ env.CYPRESS_EXAMPLE_USER_PASSWORD }}
           NEBARI_FULL_URL: https://github-actions.nebari.dev/
-        working-directory: tests_e2e/playwright
+        working-directory: tests/tests_e2e/playwright
         run: |
           # create environment file
           envsubst < .env.tpl > .env
@@ -168,15 +164,15 @@ jobs:
         with:
           name: e2e-cypress
           path: |
-            ./tests_e2e/cypress/screenshots/
-            ./tests_e2e/cypress/videos/
-            ./tests_e2e/playwright/videos/
+            ./tests/tests_e2e/cypress/screenshots/
+            ./tests/tests_e2e/cypress/videos/
+            ./tests/tests_e2e/playwright/videos/
 
       - name: Deployment Pytests
         run: |
           export KEYCLOAK_USERNAME=${CYPRESS_EXAMPLE_USER_NAME}
           export KEYCLOAK_PASSWORD=${CYPRESS_EXAMPLE_USER_PASSWORD}
-          pytest tests_deployment/ -v -s
+          pytest tests/tests_deployment/ -v -s
 
       - name: JupyterHub Notebook Tests
         # run jhub-client after pytest since jhubctl can cleanup
@@ -190,7 +186,7 @@ jobs:
                                 --validate --no-verify-ssl \
                                 --kernel python3 \
                                 --stop-server \
-                                --notebook tests_deployment/assets/notebook/simple.ipynb \
+                                --notebook tests/tests_deployment/assets/notebook/simple.ipynb \
 
       ### CLEANUP AFTER TESTS
       - name: Cleanup nebari deployment

diff --git a/.github/workflows/test-provider.yaml b/.github/workflows/test-provider.yaml
@@ -10,8 +10,6 @@ on:
       - ".github/failed-workflow-issue-templates/test-provider.md"
       - ".github/actions/publish-from-template"
       - "tests/**"
-      - "tests_deployment/**"
-      - "tests_e2e/**"
       - "scripts/**"
       - "src/**"
       - "pyproject.toml"
@@ -23,8 +21,6 @@ on:
     paths:
       - ".github/workflows/test-provider.yaml"
       - "tests/**"
-      - "tests_deployment/**"
-      - "tests_e2e/**"
       - "scripts/**"
       - "src/**"
       - "pyproject.toml"

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -5,8 +5,6 @@ on:
     paths:
       - ".github/workflows/test.yaml"
       - "tests/**"
-      - "tests_deployment/**"
-      - "tests_e2e/cypress/**"
       - "scripts/**"
       - "src/**"
       - "pyproject.toml"
@@ -19,8 +17,6 @@ on:
     paths:
       - ".github/workflows/test.yaml"
       - "tests/**"
-      - "tests_deployment/**"
-      - "tests_e2e/cypress/**"
       - "scripts/**"
       - "src/**"
       - "pyproject.toml"
@@ -56,4 +52,4 @@ jobs:
       - name: Test Nebari
         run: |
           pytest --version
-          pytest --ignore=tests_deployment --ignore=tests_e2e/playwright
+          pytest --ignore=tests/tests_deployment --ignore=tests/tests_e2e/playwright --ignore=tests/tests_integration
diff --git a/.github/workflows/test_integration.yaml b/.github/workflows/test_integration.yaml
@@ -48,4 +48,4 @@ jobs:
       - name: Integration Tests
         run: |
           pytest --version
-          pytest tests_integration/ -vvv -s -m ${{ matrix.provider }}
+          pytest tests/tests_integration/ -vvv -s -m ${{ matrix.provider }}