cleanup

.gitlab-ci.yml

@@ -8,13 +8,13 @@ stages:
   - dogfood
 
 include:
-  - remote: https://gitlab-templates.ddbuild.io/libdatadog/include-wip/one-pipeline.yml
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/include/one-pipeline.yml
   - local: ".gitlab/benchmarks.yml"
   - local: ".gitlab/macrobenchmarks.yml"
   - local: ".gitlab/dogfood.yml"
 
 variables:
-  REPO_LANG: python
+  REPO_LANG: python # "python" is used everywhere rather than "py"
 
 download_ddtrace_wheels:
   image: registry.ddbuild.io/github-cli:v27480869-eafb11d-2.43.0

.gitlab/download-dependency-wheels.sh

@@ -22,5 +22,3 @@ cd pywheels
     --platform manylinux2014 \
     --output-dir ../pywheels-dep \
     --verbose
-
-

.gitlab/download-wheels-from-gh-actions.sh

@@ -6,9 +6,6 @@ if [ -z "$CI_COMMIT_SHA" ]; then
   exit 1
 fi
 
-#Hardcoded for testing
-CI_COMMIT_SHA=d4b8e9dfcc8e90e20b51b2e89b0e0495e356713c
-
 echo "Querying for RUN_ID"
 
 timeout=600 # 10 minutes

.gitlab/prepare-oci-package.sh

@@ -25,18 +25,8 @@ BUILD_DIR=sources
 
 echo -n "$PYTHON_PACKAGE_VERSION" > sources/version
 
-# Install known compatible pip as default version shipped in Ubuntu (20.0.2)
-# does not work.
-python3 -m pip install -U "pip>=22.0"
-python3 -m pip install packaging
-
-WHEEL_ARCH="x86_64"
-if [ "$ARCH" = "arm64" ]; then
-  WHEEL_ARCH="aarch64"
-fi
-
-cp -r ../pywheels-dep/site-packages* $BUILD_DIR/ddtrace_pkgs
+cp -r ../pywheels-dep/site-packages* sources/ddtrace_pkgs
 
-cp ../lib-injection/sitecustomize.py $BUILD_DIR/
-cp ../min_compatible_versions.csv $BUILD_DIR/
-cp ../lib-injection/telemetry-forwarder.sh $BUILD_DIR/
+cp ../lib-injection/sitecustomize.py sources/
+cp ../min_compatible_versions.csv sources/
+cp ../lib-injection/telemetry-forwarder.sh sources/