backward compatibility

Author: emmettbutler

scripts/build_layers.sh

@@ -98,6 +98,19 @@ function make_path_absolute {
     echo "$(cd "$(dirname "$1")"; pwd)/$(basename "$1")"
 }
 
+function search_wheel {
+    # Args: [wheel base name] [index]
+
+    BASENAME="cp$(echo "$1" | tr -d '.')"
+    INDEX="cp$(echo "$2" | tr -d '.')"
+
+    SEARCH_PATTERN="${BASENAME}-[^\"]*${PY_TAG}[^\"]*${PLATFORM}[^\"]*\.whl"
+    echo "Searching for wheel ${SEARCH_PATTERN}"
+    export WHEEL_FILE=$(curl -sSfL "${S3_BASE}/index-${INDEX}.html" \
+        | grep -o "$SEARCH_PATTERN" \
+        | head -n 1)
+}
+
 function docker_build_zip {
     # Args: [python version] [zip destination]
 
@@ -122,11 +135,10 @@ function docker_build_zip {
             PLATFORM="manylinux2014_aarch64"
         fi
         PY_TAG="cp$(echo "$1" | tr -d '.')"
-        SEARCH_PATTERN="ddtrace_serverless-[^\"]*${PY_TAG}[^\"]*${PLATFORM}[^\"]*\.whl"
-        echo "Searching for wheel ${SEARCH_PATTERN}"
-        WHEEL_FILE=$(curl -sSfL "${S3_BASE}/index-serverless.html" \
-            | grep -o "$SEARCH_PATTERN" \
-            | head -n 1)
+        search_wheel "ddtrace_serverless" "serverless"
+        if [ -z "${WHEEL_FILE}" ]; then
+            search_wheel "ddtrace" "manylinux2014"
+        fi
         if [ -z "${WHEEL_FILE}" ]; then
             echo "No S3 wheel found for ${PY_TAG} ${PLATFORM}, using default pyproject.toml version"
         else