fixup! ci: add permissions to trigger downstream pipeline from dd-trace-py

Author: KowalskiThomas

.github/workflows/ci.yml

@@ -3,20 +3,8 @@ on:
   push:
   schedule:
     - cron: "0 0 * * *"
-  workflow_dispatch:
-    inputs:
-      dd_trace_py_commit_sha:
-        description: 'dd-trace-py commit SHA to test against (installs wheels from S3)'
-        required: false
-        type: string
-      test_scenarios:
-        description: 'Regexp to select which scenarios to run (default: python.*)'
-        required: false
-        type: string
-        default: 'python.*'
 jobs:
   schema-validation:
-    if: ${{ !inputs.dd_trace_py_commit_sha }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -27,7 +15,6 @@ jobs:
       - name: Run schema validation tests
         run: go test -v -run TestSchemaValidation
   ruff:
-    if: ${{ !inputs.dd_trace_py_commit_sha }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -43,37 +30,31 @@ jobs:
         if: success() || failure()
         run: ruff check .
   ddprof:
-    if: ${{ !inputs.dd_trace_py_commit_sha }}
     uses: ./.github/workflows/test.yml
     with:
       test_scenarios: ddprof.*
     secrets: inherit
   dotnet:
-    if: ${{ !inputs.dd_trace_py_commit_sha }}
     uses: ./.github/workflows/test.yml
     with:
       test_scenarios: dotnet.*
     secrets: inherit
   ruby:
-    if: ${{ !inputs.dd_trace_py_commit_sha }}
     uses: ./.github/workflows/test.yml
     with:
       test_scenarios: ruby.*
     secrets: inherit
   node:
-    if: ${{ !inputs.dd_trace_py_commit_sha }}
     uses: ./.github/workflows/test.yml
     with:
       test_scenarios: node.*
     secrets: inherit
   python:
     uses: ./.github/workflows/test.yml
     with:
-      test_scenarios: ${{ inputs.test_scenarios || 'python.*' }}
-      dd_trace_py_commit_sha: ${{ inputs.dd_trace_py_commit_sha || '' }}
+      test_scenarios: python.*
     secrets: inherit
   full_host:
-    if: ${{ !inputs.dd_trace_py_commit_sha }}
     uses: ./.github/workflows/test.yml
     with:
       test_scenarios: full_host.*

.github/workflows/downstream-python.yml

@@ -0,0 +1,23 @@
+name: "Downstream: dd-trace-py"
+run-name: "dd-trace-py downstream (${{ inputs.dd_trace_py_commit_sha }})"
+
+on:
+  workflow_dispatch:
+    inputs:
+      dd_trace_py_commit_sha:
+        description: 'dd-trace-py commit SHA to test against (installs wheels from S3)'
+        required: true
+        type: string
+      test_scenarios:
+        description: 'Regexp to select which scenarios to run'
+        required: false
+        type: string
+        default: 'python.*'
+
+jobs:
+  python:
+    uses: ./.github/workflows/test.yml
+    with:
+      test_scenarios: ${{ inputs.test_scenarios }}
+      ddtrace_install_url: "https://dd-trace-py-builds.s3.amazonaws.com/${{ inputs.dd_trace_py_commit_sha }}/install-manylinux2014_x86_64.sh"
+    secrets: inherit

.github/workflows/test.yml

@@ -9,8 +9,8 @@ on:
         required: false
         type: string
         default: '.*'
-      dd_trace_py_commit_sha:
-        description: 'dd-trace-py commit SHA to test against (installs wheels from S3)'
+      ddtrace_install_url:
+        description: 'URL to a ddtrace install script (e.g. from S3 builds)'
         required: false
         type: string
         default: ''
@@ -28,17 +28,10 @@ jobs:
     - name: Update perf_event_paranoid settings
       run: sudo sysctl kernel.perf_event_paranoid=1
     - name: Run Docker scenarios
-      run: |
-        SHA="${{ inputs.dd_trace_py_commit_sha }}"
-        if [ -n "$SHA" ]; then
-          export DDTRACE_INSTALL_URL="https://dd-trace-py-builds.s3.amazonaws.com/${SHA}/install-manylinux2014_x86_64.sh"
-          echo "Will install ddtrace from: ${DDTRACE_INSTALL_URL}"
-        else
-          echo "No custom ddtrace wheels requested, using PyPI"
-        fi
-        go test -timeout 20m -v -run TestScenarios
+      run: go test -timeout 20m -v -run TestScenarios
       env:
         TEST_SCENARIOS: ${{ inputs.test_scenarios }}
+        DDTRACE_INSTALL_URL: ${{ inputs.ddtrace_install_url }}
     - name: Create unique artifact name
       id: artifact_name
       if: failure()

scenarios/python_cpu/Dockerfile

@@ -1,12 +1,5 @@
-# Use an official Python runtime as a parent image
-FROM python:3.11
-
-# When set, download and run this install script to pre-install ddtrace.
-# Used by upstream dd-trace-py CI to test with just-built wheels from S3.
-ARG DDTRACE_INSTALL_URL=""
-RUN if [ -n "$DDTRACE_INSTALL_URL" ]; then \
-      curl -fsSL "$DDTRACE_INSTALL_URL" | bash; \
-    fi
+ARG BASE_IMAGE="prof-python-3.11"
+FROM $BASE_IMAGE
 
 # Set the working directory in the container
 WORKDIR /usr/src/app
@@ -20,10 +13,7 @@ RUN pip install --no-cache-dir -r requirements.txt
 
 ENV EXECUTION_TIME_SEC 30
 # Run your python script when the container launches
-ENV DD_PROFILING_ENABLED true
-ENV DD_TRACE_ENABLED false
-ENV DD_TRACE_DEBUG false
+ENV DD_TRACE_DEBUG=false
 ENV DD_PROFILING_MEMORY_ENABLED=false
-ENV DD_PROFILING_OUTPUT_PPROF="/app/data/profiles"
 
 CMD ddtrace-run python main.py

scenarios/python_pytorch_3.11/Dockerfile

@@ -1,11 +1,5 @@
-FROM python:3.11
-
-# When set, download and run this install script to pre-install ddtrace.
-# Used by upstream dd-trace-py CI to test with just-built wheels from S3.
-ARG DDTRACE_INSTALL_URL=""
-RUN if [ -n "$DDTRACE_INSTALL_URL" ]; then \
-      curl -fsSL "$DDTRACE_INSTALL_URL" | bash; \
-    fi
+ARG BASE_IMAGE="prof-python-3.11"
+FROM $BASE_IMAGE
 
 WORKDIR /usr/src/app
 
@@ -15,10 +9,7 @@ RUN pip install --no-cache-dir torch --index-url https://download.pytorch.org/wh
 RUN pip install --no-cache-dir -r requirements.txt
 
 ENV EXECUTION_TIME_SEC 30
-ENV DD_PROFILING_ENABLED true
-ENV DD_TRACE_ENABLED false
-ENV DD_TRACE_DEBUG false
+ENV DD_TRACE_DEBUG=false
 ENV DD_PROFILING_MEMORY_ENABLED=false
-ENV DD_PROFILING_OUTPUT_PPROF="/app/data/profiles"
 
 CMD ddtrace-run python main.py