From 78901d63f87c621907be58928e559762d9ac8250 Mon Sep 17 00:00:00 2001 From: Kshitij Aranke Date: Tue, 21 May 2024 21:02:22 +0100 Subject: [PATCH] [Backport 1.3.latest] Fix #9907: Add retry to tox to reduce flaky tests due to network failures (#10180) --- .github/workflows/main.yml | 16 ++++++++++++---- .../structured-logging-schema-check.yml | 6 +++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f201a631c69..666009a1e5b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -95,8 +95,12 @@ jobs: python -m pip install tox tox --version - - name: Run tox - run: tox + - name: Run unit tests + uses: nick-fields/retry@v3 + with: + timeout_minutes: 10 + max_attempts: 3 + command: tox -e unit - name: Get current date if: always() @@ -169,8 +173,12 @@ jobs: python -m pip install tox tox --version - - name: Run tests - run: tox -- --ddtrace + - name: Run integration tests + uses: nick-fields/retry@v3 + with: + timeout_minutes: 30 + max_attempts: 3 + command: tox -- --ddtrace - name: Get current date if: always() diff --git a/.github/workflows/structured-logging-schema-check.yml b/.github/workflows/structured-logging-schema-check.yml index cdd41b232a9..2d8c9c937f3 100644 --- a/.github/workflows/structured-logging-schema-check.yml +++ b/.github/workflows/structured-logging-schema-check.yml @@ -68,7 +68,11 @@ jobs: # integration tests generate a ton of logs in different files. the next step will find them all. # we actually care if these pass, because the normal test run doesn't usually include many json log outputs - name: Run integration tests - run: tox -e integration -- -nauto + uses: nick-fields/retry@v3 + with: + timeout_minutes: 30 + max_attempts: 3 + command: tox -e integration -- -nauto # apply our schema tests to every log event from the previous step # skips any output that isn't valid json