use arm wheel?

Author: rithikanarayan

ci/input_files/build.yaml.tpl

@@ -67,7 +67,7 @@ lint python:
   image: registry.ddbuild.io/images/mirror/python:{{ $runtime.image }}
   cache: &{{ $runtime.name }}-{{ $runtime.arch }}-cache
   before_script:
-    - PYTHON_VERSION={{ $runtime.python_version }} ./scripts/setup_python_env.sh
+    - PYTHON_VERSION={{ $runtime.python_version }} ARCH={{ $runtime.arch }} ./scripts/setup_python_env.sh
   script:
     - source venv/bin/activate
     - ./scripts/check_format.sh
@@ -85,7 +85,7 @@ unit-test ({{ $runtime.name }}-{{ $runtime.arch }}):
     PYTHONFAULTHANDLER: "1"
   cache: &{{ $runtime.name }}-{{ $runtime.arch }}-cache
   before_script:
-    - PYTHON_VERSION={{ $runtime.python_version }} ./scripts/setup_python_env.sh
+    - PYTHON_VERSION={{ $runtime.python_version }} ARCH={{ $runtime.arch }} ./scripts/setup_python_env.sh
   script:
     - source venv/bin/activate
     - pytest -vv

scripts/_spec_ddtrace_dep.sh

@@ -70,7 +70,15 @@ spec_ddtrace_dep() {
         fi
         S3_BASE="https://dd-trace-py-builds.s3.amazonaws.com/${UPSTREAM_PIPELINE_ID}"
         PY_TAG="cp$(echo "$PYTHON_VERSION" | tr -d '.')"
-        if [ "${ARCH:-amd64}" = "amd64" ]; then
+        # Wheel platform tag must match the machine that runs pip (or CI matrix arch).
+        # Default used to be amd64 when unset; prefer host arch so ARM runners/local dev work.
+        if [ -z "${ARCH:-}" ]; then
+            case "$(uname -m)" in
+                aarch64 | arm64) ARCH=arm64 ;;
+                *) ARCH=amd64 ;;
+            esac
+        fi
+        if [ "$ARCH" = "amd64" ]; then
             PLATFORM="manylinux2014_x86_64"
         else
             PLATFORM="manylinux2014_aarch64"

scripts/setup_python_env.sh

@@ -39,6 +39,9 @@
 # Environment variables:
 #   PYTHON_VERSION   Python minor version (e.g. 3.12 or just 12). Required
 #                    when the UPSTREAM_PIPELINE_ID branch is taken.
+#   ARCH             "amd64" or "arm64". Required for correct ddtrace wheel
+#                    selection when UPSTREAM_PIPELINE_ID is set (GitLab matrix
+#                    should pass the runtime arch; if unset, host arch is used).
 
 set -e