Merge branch 'main' into add-profile-trace-testing

newrelic · Jun 30, 2023 · d68353d · d68353d
2 parents b3c11a1 + 998b035
commit d68353d
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 121 deletions.
diff --git a/.github/actions/setup-python-matrix/action.yml b/.github/actions/setup-python-matrix/action.yml
diff --git a/.github/containers/Dockerfile b/.github/containers/Dockerfile
@@ -79,7 +79,7 @@ RUN echo 'eval "$(pyenv init -)"' >>$HOME/.bashrc && \
     pyenv update
 
 # Install Python
-ARG PYTHON_VERSIONS="3.10 3.9 3.8 3.7 3.11 2.7 pypy2.7-7.3.11 pypy3.7"
+ARG PYTHON_VERSIONS="3.10 3.9 3.8 3.7 3.11 2.7 pypy2.7-7.3.11 pypy3.8"
 COPY --chown=1000:1000 --chmod=+x ./install-python.sh /tmp/install-python.sh
 COPY ./requirements.txt /requirements.txt
 RUN /tmp/install-python.sh && \

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -119,7 +119,7 @@ jobs:
 
     runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
+      image: ghcr.io/newrelic/newrelic-python-agent-ci:sha-b0ffe8bdbb28ba0579377076ad680054da8fbc28
       options: >-
         --add-host=host.docker.internal:host-gateway
     timeout-minutes: 30
@@ -164,7 +164,7 @@ jobs:
 
     runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
+      image: ghcr.io/newrelic/newrelic-python-agent-ci:sha-b0ffe8bdbb28ba0579377076ad680054da8fbc28
       options: >-
         --add-host=host.docker.internal:host-gateway
     timeout-minutes: 30
@@ -209,7 +209,7 @@ jobs:
 
     runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
+      image: ghcr.io/newrelic/newrelic-python-agent-ci:sha-b0ffe8bdbb28ba0579377076ad680054da8fbc28
       options: >-
         --add-host=host.docker.internal:host-gateway
     timeout-minutes: 30
@@ -269,7 +269,7 @@ jobs:
 
     runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
+      image: ghcr.io/newrelic/newrelic-python-agent-ci:sha-b0ffe8bdbb28ba0579377076ad680054da8fbc28
       options: >-
         --add-host=host.docker.internal:host-gateway
     timeout-minutes: 30
@@ -332,7 +332,7 @@ jobs:
 
     runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
+      image: ghcr.io/newrelic/newrelic-python-agent-ci:sha-b0ffe8bdbb28ba0579377076ad680054da8fbc28
       options: >-
         --add-host=host.docker.internal:host-gateway
     timeout-minutes: 30
@@ -395,7 +395,7 @@ jobs:
 
     runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
+      image: ghcr.io/newrelic/newrelic-python-agent-ci:sha-b0ffe8bdbb28ba0579377076ad680054da8fbc28
       options: >-
         --add-host=host.docker.internal:host-gateway
     timeout-minutes: 30
@@ -453,7 +453,7 @@ jobs:
 
     runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
+      image: ghcr.io/newrelic/newrelic-python-agent-ci:sha-b0ffe8bdbb28ba0579377076ad680054da8fbc28
       options: >-
         --add-host=host.docker.internal:host-gateway
     timeout-minutes: 30
@@ -513,7 +513,7 @@ jobs:
 
     runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
+      image: ghcr.io/newrelic/newrelic-python-agent-ci:sha-b0ffe8bdbb28ba0579377076ad680054da8fbc28
       options: >-
         --add-host=host.docker.internal:host-gateway
     timeout-minutes: 30
@@ -571,7 +571,7 @@ jobs:
 
     runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
+      image: ghcr.io/newrelic/newrelic-python-agent-ci:sha-b0ffe8bdbb28ba0579377076ad680054da8fbc28
       options: >-
         --add-host=host.docker.internal:host-gateway
     timeout-minutes: 30
@@ -630,7 +630,7 @@ jobs:
 
   #   runs-on: ubuntu-20.04
   #   container:
-  #     image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
+  #     image: ghcr.io/newrelic/newrelic-python-agent-ci:sha-b0ffe8bdbb28ba0579377076ad680054da8fbc28
   #     options: >-
   #       --add-host=host.docker.internal:host-gateway
   #   timeout-minutes: 30
@@ -710,7 +710,7 @@ jobs:
 
     runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
+      image: ghcr.io/newrelic/newrelic-python-agent-ci:sha-b0ffe8bdbb28ba0579377076ad680054da8fbc28
       options: >-
         --add-host=host.docker.internal:host-gateway
     timeout-minutes: 30
@@ -768,7 +768,7 @@ jobs:
 
     runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
+      image: ghcr.io/newrelic/newrelic-python-agent-ci:sha-b0ffe8bdbb28ba0579377076ad680054da8fbc28
       options: >-
         --add-host=host.docker.internal:host-gateway
     timeout-minutes: 30
@@ -828,7 +828,7 @@ jobs:
 
     runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
+      image: ghcr.io/newrelic/newrelic-python-agent-ci:sha-b0ffe8bdbb28ba0579377076ad680054da8fbc28
       options: >-
         --add-host=host.docker.internal:host-gateway
     timeout-minutes: 30
@@ -889,7 +889,7 @@ jobs:
 
     runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
+      image: ghcr.io/newrelic/newrelic-python-agent-ci:sha-b0ffe8bdbb28ba0579377076ad680054da8fbc28
       options: >-
         --add-host=host.docker.internal:host-gateway
     timeout-minutes: 30