try

getsentry · Jun 19, 2023 · cdf3fc2 · cdf3fc2
1 parent 0792db2
commit cdf3fc2
Show file tree

Hide file tree

Showing 18 changed files with 79 additions and 2 deletions.
diff --git a/.github/workflows/test-common.yml b/.github/workflows/test-common.yml
@@ -27,6 +27,8 @@ jobs:
     name: common, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    container:
+      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -75,6 +77,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
+    container:
+      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-boto3.yml b/.github/workflows/test-integration-boto3.yml
@@ -27,6 +27,8 @@ jobs:
     name: boto3, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    container:
+      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -75,6 +77,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
+    container:
+      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-bottle.yml b/.github/workflows/test-integration-bottle.yml
@@ -27,6 +27,8 @@ jobs:
     name: bottle, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    container:
+      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -75,6 +77,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
+    container:
+      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-celery.yml b/.github/workflows/test-integration-celery.yml
@@ -27,6 +27,8 @@ jobs:
     name: celery, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    container:
+      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -75,6 +77,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
+    container:
+      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-django.yml b/.github/workflows/test-integration-django.yml
@@ -27,6 +27,8 @@ jobs:
     name: django, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    container:
+      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -93,6 +95,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
+    container:
+      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-falcon.yml b/.github/workflows/test-integration-falcon.yml
@@ -27,6 +27,8 @@ jobs:
     name: falcon, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    container:
+      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -75,6 +77,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
+    container:
+      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-flask.yml b/.github/workflows/test-integration-flask.yml
@@ -27,6 +27,8 @@ jobs:
     name: flask, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    container:
+      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -75,6 +77,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
+    container:
+      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-gevent.yml b/.github/workflows/test-integration-gevent.yml
@@ -27,6 +27,8 @@ jobs:
     name: gevent, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    container:
+      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -75,6 +77,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
+    container:
+      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-huey.yml b/.github/workflows/test-integration-huey.yml
@@ -27,6 +27,8 @@ jobs:
     name: huey, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    container:
+      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -75,6 +77,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
+    container:
+      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-pymongo.yml b/.github/workflows/test-integration-pymongo.yml
@@ -27,6 +27,8 @@ jobs:
     name: pymongo, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    container:
+      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -75,6 +77,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
+    container:
+      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-pyramid.yml b/.github/workflows/test-integration-pyramid.yml
@@ -27,6 +27,8 @@ jobs:
     name: pyramid, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    container:
+      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -75,6 +77,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
+    container:
+      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-redis.yml b/.github/workflows/test-integration-redis.yml
@@ -27,6 +27,8 @@ jobs:
     name: redis, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    container:
+      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -75,6 +77,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
+    container:
+      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-rediscluster.yml b/.github/workflows/test-integration-rediscluster.yml
@@ -27,6 +27,8 @@ jobs:
     name: rediscluster, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    container:
+      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -75,6 +77,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
+    container:
+      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-requests.yml b/.github/workflows/test-integration-requests.yml
@@ -27,6 +27,8 @@ jobs:
     name: requests, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    container:
+      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -75,6 +77,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
+    container:
+      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-rq.yml b/.github/workflows/test-integration-rq.yml
@@ -27,6 +27,8 @@ jobs:
     name: rq, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    container:
+      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -75,6 +77,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
+    container:
+      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/.github/workflows/test-integration-sqlalchemy.yml b/.github/workflows/test-integration-sqlalchemy.yml
@@ -27,6 +27,8 @@ jobs:
     name: sqlalchemy, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    container:
+      image: python:2.7.18-buster
 
     strategy:
       fail-fast: false
@@ -75,6 +77,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
+    container:
+      image: python:2.7.18-buster
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/scripts/split-tox-gh-actions/ci-yaml.txt b/scripts/split-tox-gh-actions/ci-yaml.txt
@@ -27,6 +27,7 @@ jobs:
     name: {{ framework }}, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+{{ docker_image }}
 {{ strategy_matrix }}
 {{ services }}
 
@@ -67,6 +68,7 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-20.04
+{{ docker_image }}
     steps:
       - name: Check for failures
         if: contains(needs.test.result, 'failure')

diff --git a/scripts/split-tox-gh-actions/split-tox-gh-actions.py b/scripts/split-tox-gh-actions/split-tox-gh-actions.py
@@ -42,6 +42,11 @@
         os: [ubuntu-20.04]
 """
 
+DOCKER_IMAGE_FOR_27 = """\
+    container:
+      image: python:2.7.18-buster
+"""
+
 
 def write_yaml_file(
     template,
@@ -52,9 +57,10 @@ def write_yaml_file(
     # render template for print
     out = ""
     for template_line in template:
-        if template_line == "{{ strategy_matrix }}\n":
-            py_versions = [f'"{py.replace("py", "")}"' for py in python_versions]
+        py_versions = [py.replace("py", "") for py in python_versions]
 
+        if template_line == "{{ strategy_matrix }}\n":
+            py_versions = [f'"{py}"' for py in py_versions]
             m = MATRIX_DEFINITION
             m = m.replace("{{ framework }}", current_framework).replace(
                 "{{ python-version }}", ",".join(py_versions)
@@ -67,6 +73,11 @@ def write_yaml_file(
                 out += "".join(f.readlines())
                 f.close()
 
+        elif template_line == "{{ docker_image }}\n":
+            print(py_versions)
+            if "2.7" in py_versions:
+                out += DOCKER_IMAGE_FOR_27
+
         else:
             out += template_line.replace("{{ framework }}", current_framework)