From 3884f1d70a48b4a3414ed56576c9f0052277e044 Mon Sep 17 00:00:00 2001 From: rkuo-danswer Date: Wed, 18 Sep 2024 22:36:07 -0700 Subject: [PATCH] Bugfix/larger test runner (#2508) * add pip retries to the github workflows too * let's try running on amd64 ... docker builds are unusually flaky * bump * try large * no yaml anchors * switch back down to Amd64 --------- Co-authored-by: Richard Kuo --- .github/workflows/pr-helm-chart-testing.yml.disabled.txt | 6 +++--- .github/workflows/pr-python-checks.yml | 6 +++--- .github/workflows/pr-python-connector-tests.yml | 4 ++-- .github/workflows/pr-python-tests.yml | 4 ++-- .github/workflows/run-it.yml | 9 ++++----- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/pr-helm-chart-testing.yml.disabled.txt b/.github/workflows/pr-helm-chart-testing.yml.disabled.txt index 7c4903a07..d2d7c7d5b 100644 --- a/.github/workflows/pr-helm-chart-testing.yml.disabled.txt +++ b/.github/workflows/pr-helm-chart-testing.yml.disabled.txt @@ -37,9 +37,9 @@ jobs: backend/requirements/model_server.txt - run: | python -m pip install --upgrade pip - pip install -r backend/requirements/default.txt - pip install -r backend/requirements/dev.txt - pip install -r backend/requirements/model_server.txt + pip install --retries 5 --timeout 30 -r backend/requirements/default.txt + pip install --retries 5 --timeout 30 -r backend/requirements/dev.txt + pip install --retries 5 --timeout 30 -r backend/requirements/model_server.txt - name: Set up chart-testing uses: helm/chart-testing-action@v2.6.1 diff --git a/.github/workflows/pr-python-checks.yml b/.github/workflows/pr-python-checks.yml index 9cc624fa0..e33bad59e 100644 --- a/.github/workflows/pr-python-checks.yml +++ b/.github/workflows/pr-python-checks.yml @@ -24,9 +24,9 @@ jobs: backend/requirements/model_server.txt - run: | python -m pip install --upgrade pip - pip install -r backend/requirements/default.txt - pip install -r backend/requirements/dev.txt - pip install -r backend/requirements/model_server.txt + pip install --retries 5 --timeout 30 -r backend/requirements/default.txt + pip install --retries 5 --timeout 30 -r backend/requirements/dev.txt + pip install --retries 5 --timeout 30 -r backend/requirements/model_server.txt - name: Run MyPy run: | diff --git a/.github/workflows/pr-python-connector-tests.yml b/.github/workflows/pr-python-connector-tests.yml index 00b92c9b0..d0c693dd1 100644 --- a/.github/workflows/pr-python-connector-tests.yml +++ b/.github/workflows/pr-python-connector-tests.yml @@ -39,8 +39,8 @@ jobs: - name: Install Dependencies run: | python -m pip install --upgrade pip - pip install -r backend/requirements/default.txt - pip install -r backend/requirements/dev.txt + pip install --retries 5 --timeout 30 -r backend/requirements/default.txt + pip install --retries 5 --timeout 30 -r backend/requirements/dev.txt - name: Run Tests shell: script -q -e -c "bash --noprofile --norc -eo pipefail {0}" diff --git a/.github/workflows/pr-python-tests.yml b/.github/workflows/pr-python-tests.yml index 1acdbc5dd..30d1d3ad2 100644 --- a/.github/workflows/pr-python-tests.yml +++ b/.github/workflows/pr-python-tests.yml @@ -29,8 +29,8 @@ jobs: - name: Install Dependencies run: | python -m pip install --upgrade pip - pip install -r backend/requirements/default.txt - pip install -r backend/requirements/dev.txt + pip install --retries 5 --timeout 30 -r backend/requirements/default.txt + pip install --retries 5 --timeout 30 -r backend/requirements/dev.txt - name: Run Tests shell: script -q -e -c "bash --noprofile --norc -eo pipefail {0}" diff --git a/.github/workflows/run-it.yml b/.github/workflows/run-it.yml index 75df647c4..b1a55bfff 100644 --- a/.github/workflows/run-it.yml +++ b/.github/workflows/run-it.yml @@ -13,8 +13,7 @@ env: jobs: integration-tests: - runs-on: - group: 'arm64-image-builders' + runs-on: Amd64 steps: - name: Checkout code uses: actions/checkout@v4 @@ -41,7 +40,7 @@ jobs: with: context: ./backend file: ./backend/Dockerfile - platforms: linux/arm64 + platforms: linux/amd64 tags: danswer/danswer-backend:it cache-from: type=registry,ref=danswer/danswer-backend:it cache-to: | @@ -53,7 +52,7 @@ jobs: with: context: ./backend file: ./backend/Dockerfile.model_server - platforms: linux/arm64 + platforms: linux/amd64 tags: danswer/danswer-model-server:it cache-from: type=registry,ref=danswer/danswer-model-server:it cache-to: | @@ -65,7 +64,7 @@ jobs: with: context: ./backend file: ./backend/tests/integration/Dockerfile - platforms: linux/arm64 + platforms: linux/amd64 tags: danswer/integration-test-runner:it cache-from: type=registry,ref=danswer/integration-test-runner:it cache-to: |