Browse Source

test: py3 required on master except snuba (#20537)

josh 4 years ago
parent
commit
042f904291
2 changed files with 10 additions and 14 deletions
  1. 1 3
      .github/workflows/acceptance.yml
  2. 9 11
      .github/workflows/python.yml

+ 1 - 3
.github/workflows/acceptance.yml

@@ -104,7 +104,6 @@ jobs:
 
     acceptance:
       runs-on: ubuntu-16.04
-      continue-on-error: true
       strategy:
         matrix:
           instance: [0, 1, 2]
@@ -252,9 +251,8 @@ jobs:
             snapshot-path: .artifacts/visual-snapshots
 
     py3-acceptance:
-      name: 'py3 acceptance [ignore fails]'
+      name: 'python3.6 acceptance'
       runs-on: ubuntu-16.04
-      continue-on-error: true
       strategy:
         matrix:
           instance: [0, 1, 2]

+ 9 - 11
.github/workflows/python.yml

@@ -1,5 +1,9 @@
 name: python
 on:
+  push:
+    branches:
+      - master
+      - releases/**
   pull_request:
     paths:
       # Matches all python files regardless of directory depth.
@@ -8,6 +12,8 @@ on:
 
 jobs:
   check-missing-migration:
+    # Not necessary for this job to run on the push branches.
+    if: ${{ github.ref != 'refs/heads/master' || contains(github.ref, 'releases/') }}
     name: Check Migration Required
     runs-on: ubuntu-16.04
 
@@ -105,9 +111,8 @@ jobs:
           sentry django makemigrations -n ci_test --check --dry-run --no-input || (echo '::error::Error: Migration required -- to generate a migration, run `sentry django makemigrations -n <some_name>`' && exit 1)
 
   test-py3:
-    name: 'py3 [ignore fails]'
+    name: 'python3.6 backend'
     runs-on: ubuntu-16.04
-    continue-on-error: true
     strategy:
       matrix:
         instance: [0, 1, 2, 3]
@@ -189,14 +194,7 @@ jobs:
           sentry init
           sentry devservices up postgres redis clickhouse snuba
 
-      # When we have a full backend test matrix for py3, make a py2 one with new rb as well.
-      # TODO(joshuarli):
-      # - kakfa+zookeeper devservices necessary for what test suites?
-      # - is `docker exec sentry_snuba snuba migrate` needed?
-      # - TEST_SUITE=relay-integration
-      # - TEST_SUITE=symbolicator
-      # - TEST_SUITE=cli
-      - name: Python 3.6 backend w/o migrations (${{ steps.config.outputs.matrix-instance-number }} of ${{ strategy.job-total }})
+      - name: Python 3.6 backend (${{ steps.config.outputs.matrix-instance-number }} of ${{ strategy.job-total }})
         if: always()
         run: |
           make travis-test-postgres
@@ -204,7 +202,7 @@ jobs:
           TEST_GROUP: ${{ matrix.instance }}
 
   test-py3-snuba:
-    name: 'py3 snuba [ignore fails]'
+    name: '[ignore fails] python3.6 backend (snuba)'
     runs-on: ubuntu-16.04
     continue-on-error: true
     strategy: