feat(hc): Split silo tests

getsentry · Aug 18, 2023 · a50e50b · a50e50b
1 parent 3089da8
commit a50e50b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/.github/actions/setup-sentry/action.yml b/.github/actions/setup-sentry/action.yml
@@ -74,7 +74,7 @@ runs:
 
         ### pytest configuration ###
         echo "PY_COLORS=1" >> "$GITHUB_ENV"
-        echo "PYTEST_ADDOPTS=--reruns=5 --durations=10 --fail-slow=60s" >> $GITHUB_ENV
+        echo "PYTEST_ADDOPTS=--reruns=0 --durations=10 --fail-slow=60s" >> $GITHUB_ENV
 
         ### pytest-sentry configuration ###
         if [ "$GITHUB_REPOSITORY" = "getsentry/sentry" ]; then

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -67,7 +67,7 @@ jobs:
     needs: files-changed
     name: backend test
     runs-on: ubuntu-20.04
-    timeout-minutes: 40
+    timeout-minutes: 80
     strategy:
       # This helps not having to run multiple jobs because one fails, thus, reducing resource usage
       # and reducing the risk that one of many runs would turn red again (read: intermittent tests)
@@ -95,6 +95,10 @@ jobs:
         run: |
           echo "SENTRY_USE_SPLIT_DBS=1" >> "$GITHUB_ENV"
 
+      - name: Update environment for silo tests
+        run: |
+          echo "SENTRY_FORCE_SILOED_TESTS=1" >> "$GITHUB_ENV"
+
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
         id: setup
@@ -142,6 +146,10 @@ jobs:
         run: |
           echo "SENTRY_USE_SPLIT_DBS=1" >> "$GITHUB_ENV"
 
+      - name: Update environment for silo tests
+        run: |
+          echo "SENTRY_FORCE_SILOED_TESTS=1" >> "$GITHUB_ENV"
+
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
         id: setup
@@ -179,6 +187,10 @@ jobs:
         run: |
           echo "SENTRY_USE_SPLIT_DBS=1" >> "$GITHUB_ENV"
 
+      - name: Update environment for silo tests
+        run: |
+          echo "SENTRY_FORCE_SILOED_TESTS=1" >> "$GITHUB_ENV"
+
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
         id: setup
@@ -338,6 +350,10 @@ jobs:
         run: |
           echo "SENTRY_USE_SPLIT_DBS=1" >> "$GITHUB_ENV"
 
+      - name: Update environment for silo tests
+        run: |
+          echo "SENTRY_FORCE_SILOED_TESTS=1" >> "$GITHUB_ENV"
+
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
         id: setup
@@ -367,6 +383,10 @@ jobs:
         run: |
           echo "SENTRY_USE_SPLIT_DBS=1" >> "$GITHUB_ENV"
 
+      - name: Update environment for silo tests
+        run: |
+          echo "SENTRY_FORCE_SILOED_TESTS=1" >> "$GITHUB_ENV"
+
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
         id: setup
@@ -397,7 +417,7 @@ jobs:
     needs: files-changed
     name: snuba test
     runs-on: ubuntu-20.04
-    timeout-minutes: 30
+    timeout-minutes: 60
     strategy:
       # This helps not having to run multiple jobs because one fails, thus, reducing resource usage
       # and reducing the risk that one of many runs would turn red again (read: intermittent tests)
@@ -422,6 +442,10 @@ jobs:
         run: |
           echo "SENTRY_USE_SPLIT_DBS=1" >> "$GITHUB_ENV"
 
+      - name: Update environment for silo tests
+        run: |
+          echo "SENTRY_FORCE_SILOED_TESTS=1" >> "$GITHUB_ENV"
+
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
         id: setup