From 419b63afc4080e393f3f2030396ae47c02114f65 Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya <ben@byk.im>
Date: Sat, 5 Dec 2020 00:16:12 +0300
Subject: [PATCH 1/4] ref(py3): Remove SENTRY_PYTHON3 and -py3 versons

This is in preparation to make the PY3 version the default for Docker images and self-hosted. It is part **4/5**:

1. ~~Add `-py2` variants for the Python 2 build tags and introduce the `SENTRY_PYTHON2` env variable usage~~ (getsentry/sentry#22460)
2. ~~Switch getsentry/onpremise to Python 3 by default*, introducing the `SENTRY_PYTHON2` env var for Py2 builds via the `-py2` suffix~~ (getsentry/onpremise#763)
3. ~~Move the unsuffixed version of the builds to Python 3~~ (getsentry/sentry#22466)
4. **Remove the `SENTRY_PYTHON3` env var support and `-py3` prefix usage from getsentry/onpremise**
5. Remove tagging of `-py3` builds from getsentry/sentry
---
 .github/workflows/test.yml | 1 -
 docker-compose.yml         | 1 -
 install.sh                 | 2 +-
 sentry/Dockerfile          | 3 +--
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fd5809bc139..5cd4f64a1aa 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -32,7 +32,6 @@ jobs:
         env:
           COMPOSE_PARALLEL_LIMIT: 10
           SENTRY_PYTHON2: ${{ matrix.py2 == '1' || '' }}
-          SENTRY_PYTHON3: ${{ matrix.py2 != '1' || ''}}
         run: |
           ./install.sh
           ./test.sh
diff --git a/docker-compose.yml b/docker-compose.yml
index 6fb685fdda5..5909226ae47 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,6 @@ x-sentry-defaults: &sentry_defaults
     args:
       - SENTRY_IMAGE
       - SENTRY_PYTHON2
-      - SENTRY_PYTHON3
   image: sentry-onpremise-local
   depends_on:
     - redis
diff --git a/install.sh b/install.sh
index bb123ea6830..2ec1832167a 100755
--- a/install.sh
+++ b/install.sh
@@ -217,7 +217,7 @@ echo ""
 $dc pull -q --ignore-pull-failures 2>&1 | grep -v -- -onpremise-local || true
 
 # We may not have the set image on the repo (local images) so allow fails
-docker pull ${SENTRY_IMAGE}${SENTRY_PYTHON2:+-py2}${SENTRY_PYTHON3:+-py3} || true;
+docker pull ${SENTRY_IMAGE}${SENTRY_PYTHON2:+-py2} || true;
 
 echo ""
 echo "Building and tagging Docker images..."
diff --git a/sentry/Dockerfile b/sentry/Dockerfile
index 8d17146ad8a..812056ead1d 100644
--- a/sentry/Dockerfile
+++ b/sentry/Dockerfile
@@ -1,7 +1,6 @@
 ARG SENTRY_IMAGE
 ARG SENTRY_PYTHON2
-ARG SENTRY_PYTHON3
-FROM ${SENTRY_IMAGE}${SENTRY_PYTHON2:+-py2}${SENTRY_PYTHON3:+-py3}
+FROM ${SENTRY_IMAGE}${SENTRY_PYTHON2:+-py2}
 
 COPY . /usr/src/sentry
 

From c1442417ae73b4501447ab9725cd3acc8b00b8da Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya <ben@byk.im>
Date: Sat, 5 Dec 2020 00:45:15 +0300
Subject: [PATCH 2/4] come on GitHub Actions...

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5cd4f64a1aa..35d0957b278 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,7 +30,7 @@ jobs:
 
       - name: Install and test
         env:
-          COMPOSE_PARALLEL_LIMIT: 10
+          COMPOSE_PARALLEL_LIMIT: 5
           SENTRY_PYTHON2: ${{ matrix.py2 == '1' || '' }}
         run: |
           ./install.sh

From d24e74548c65783bb1b0dc215572c91efbdd3b99 Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya <ben@byk.im>
Date: Sat, 5 Dec 2020 01:12:57 +0300
Subject: [PATCH 3/4] okay maybe a bit faster

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 35d0957b278..1166b711e4a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,7 +30,7 @@ jobs:
 
       - name: Install and test
         env:
-          COMPOSE_PARALLEL_LIMIT: 5
+          COMPOSE_PARALLEL_LIMIT: 8
           SENTRY_PYTHON2: ${{ matrix.py2 == '1' || '' }}
         run: |
           ./install.sh

From f04d9205df43ef61ebeb9a195dcedefde5688152 Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya <ben@byk.im>
Date: Sat, 5 Dec 2020 01:38:04 +0300
Subject: [PATCH 4/4] back to 10

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1166b711e4a..5cd4f64a1aa 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,7 +30,7 @@ jobs:
 
       - name: Install and test
         env:
-          COMPOSE_PARALLEL_LIMIT: 8
+          COMPOSE_PARALLEL_LIMIT: 10
           SENTRY_PYTHON2: ${{ matrix.py2 == '1' || '' }}
         run: |
           ./install.sh