test

danswer-ai · Dec 1, 2024 · b5ccd04 · b5ccd04
1 parent de52fb5
commit b5ccd04
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/.github/workflows/pr-integration-tests-parallel.yml b/.github/workflows/pr-integration-tests-parallel.yml
@@ -8,19 +8,20 @@ on:
   pull_request:
     branches:
       - main
-      - 'release/**'
+      - "release/**"
 
 env:
   OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
   SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
   CONFLUENCE_TEST_SPACE_URL: ${{ secrets.CONFLUENCE_TEST_SPACE_URL }}
   CONFLUENCE_USER_NAME: ${{ secrets.CONFLUENCE_USER_NAME }}
   CONFLUENCE_ACCESS_TOKEN: ${{ secrets.CONFLUENCE_ACCESS_TOKEN }}
-  
+
 jobs:
   integration-tests:
     # See https://runs-on.com/runners/linux/
-    runs-on: [runs-on,runner=8cpu-linux-x64,ram=16,"run-id=${{ github.run_id }}"]
+    runs-on:
+      [runs-on, runner=8cpu-linux-x64, ram=16, "run-id=${{ github.run_id }}"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -33,7 +34,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
-      
+
       - name: Build integration test Docker image
         uses: ./.github/actions/custom-build-and-push
         with:
@@ -46,11 +47,13 @@ jobs:
           cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }}
           cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max
 
-
       - name: Run Standard Integration Tests
         run: |
           echo "Running integration tests..."
-          docker run danswer/danswer-integration:test PYTHONPATH=. python tests/integration/run.py
+          docker run \
+            -e PYTHONPATH=/app \
+            danswer/danswer-integration:test \
+            python /app/tests/integration/run.py
         continue-on-error: true
         id: run_tests
 
@@ -75,7 +78,7 @@ jobs:
       #   run: |
       #     cd deployment/docker_compose
       #     docker compose -f docker-compose.dev.yml -p danswer-stack down -v
-      
+
       # - name: Upload logs
       #   if: success() || failure()
       #   uses: actions/upload-artifact@v4

diff --git a/.github/workflows/pr-integration-tests.yml b/.github/workflows/pr-integration-tests.yml
@@ -5,10 +5,10 @@ concurrency:
 
 on:
   merge_group:
-  pull_request:
-    branches:
-      - main
-      - 'release/**'
+  # pull_request:
+  #   branches:
+  #     - main
+  #     - 'release/**'
 
 env:
   OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}