Upgrade developer tooling

DataDog · Feb 25, 2025 · 5b2d1da · 5b2d1da
1 parent 2781d43
commit 5b2d1da
Show file tree

Hide file tree

Showing 29 changed files with 112 additions and 110 deletions.
diff --git a/.github/workflows/go-update.yml b/.github/workflows/go-update.yml
@@ -48,9 +48,9 @@ jobs:
 
       - name: Install dependencies
         run: |
-          DEVA_VERSION=$(grep DEVA_VERSION deva.env | awk -F= '/^DEVA_VERSION=/ {print $2}')
-          python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}"
-          python3 -m deva -v self dep sync -f legacy-build
+          DDA_VERSION=$(grep DDA_VERSION dda.env | awk -F= '/^DDA_VERSION=/ {print $2}')
+          python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@${DDA_VERSION}"
+          python3 -m dda -v self dep sync -f legacy-build
 
       - name: Update Go version
         run: |

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -115,13 +115,13 @@ get_agent_version:
     - eval "$(aws ecr get-login --region us-east-1 --no-include-email --registry-ids 486234852809)"
     # Build
     - GO_BUILD_ARGS=$(cat go.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
-    - DEVA_BUILD_ARGS=$(cat deva.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
+    - DDA_BUILD_ARGS=$(cat dda.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
     - >-
       docker build
       --build-arg BASE_IMAGE=$BASE_IMAGE
       --build-arg DD_TARGET_ARCH=$DD_TARGET_ARCH
       $GO_BUILD_ARGS
-      $DEVA_BUILD_ARGS
+      $DDA_BUILD_ARGS
       $CUSTOM_BUILD_ARGS
       --tag registry.ddbuild.io/ci/datadog-agent-buildimages/$IMAGE${ECR_TEST_ONLY}:$IMAGE_VERSION
       --file $DOCKERFILE .
@@ -154,13 +154,13 @@ get_agent_version:
     - aws ssm get-parameter --region us-east-1 --name ci.datadog-agent.docker_hub_pwd --with-decryption --query "Parameter.Value" --out text | docker login --username "$DOCKER_REGISTRY_LOGIN" --password-stdin docker.io
     # Build
     - GO_BUILD_ARGS=$(cat go.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
-    - DEVA_BUILD_ARGS=$(cat deva.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
+    - DDA_BUILD_ARGS=$(cat dda.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
     - >-
       docker build
       --build-arg BASE_IMAGE=$BASE_IMAGE
       --build-arg DD_TARGET_ARCH=$DD_TARGET_ARCH
       $GO_BUILD_ARGS
-      $DEVA_BUILD_ARGS
+      $DDA_BUILD_ARGS
       $CUSTOM_BUILD_ARGS
       --tag registry.ddbuild.io/ci/datadog-agent-buildimages/$IMAGE${ECR_TEST_ONLY}:$IMAGE_VERSION
       --label target=none
@@ -322,13 +322,13 @@ build_circleci_runner:
     - aws ssm get-parameter --region us-east-1 --name ci.datadog-agent.docker_hub_pwd --with-decryption --query "Parameter.Value" --out text | docker login --username "$DOCKER_REGISTRY_LOGIN" --password-stdin docker.io
     # Build
     - GO_BUILD_ARGS=$(cat go.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
-    - DEVA_BUILD_ARGS=$(cat deva.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
+    - DDA_BUILD_ARGS=$(cat dda.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
     - >-
       docker build
       --build-arg BASE_IMAGE=$BASE_IMAGE
       --build-arg DD_TARGET_ARCH=$DD_TARGET_ARCH
       $GO_BUILD_ARGS
-      $DEVA_BUILD_ARGS
+      $DDA_BUILD_ARGS
       $CUSTOM_BUILD_ARGS
       --tag datadog/agent-buildimages-${IMAGE}${ECR_TEST_ONLY}:$IMAGE_VERSION
       --file $DOCKERFILE .
@@ -413,9 +413,9 @@ push_to_datadog_agent:
       done
     # Read the Github app private token from AWS SSM
     - export GITHUB_KEY_B64=$(aws ssm get-parameter --region us-east-1 --name $SSM_GITHUB_APP_KEY --with-decryption --query "Parameter.Value" --out text)
-    - export DEVA_VERSION=$(grep DEVA_VERSION deva.env | awk -F= '/^DEVA_VERSION=/ {print $2}')
-    - pip install "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}"
-    - deva -v self dep sync -f legacy-build
+    - export DDA_VERSION=$(grep DDA_VERSION dda.env | awk -F= '/^DDA_VERSION=/ {print $2}')
+    - pip install "git+https://github.com/DataDog/datadog-agent-dev.git@${DDA_VERSION}"
+    - dda -v self dep sync -f legacy-build
     - inv update-datadog-agent-buildimages --images-id "$IMAGES_ID" --ref "$REF" --branch "$BRANCH" --test-version
 
 .winbuild: &winbuild

diff --git a/.gitlab/dev_envs.yml b/.gitlab/dev_envs.yml
@@ -20,25 +20,25 @@
     - DOCKER_REGISTRY_LOGIN=$(aws ssm get-parameter --region us-east-1 --name ci.datadog-agent.docker_hub_login --with-decryption --query "Parameter.Value" --out text)
     - aws ssm get-parameter --region us-east-1 --name ci.datadog-agent.docker_hub_pwd --with-decryption --query "Parameter.Value" --out text | docker login --username "$DOCKER_REGISTRY_LOGIN" --password-stdin docker.io
     # Build
-    - DEVA_VERSION_ARG=$(grep DEVA_VERSION deva.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
+    - DDA_VERSION_ARG=$(grep DDA_VERSION dda.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
     - >-
       docker build dev-envs/$PLATFORM
       --build-arg ARCH=$BASE_IMAGE_ARCH
       --build-arg TAG=$BASE_IMAGE_TAG
-      $DEVA_VERSION_ARG
+      $DDA_VERSION_ARG
 
 .publish_dev_env:
   script:
     # Docker Hub login
     - DOCKER_REGISTRY_LOGIN=$(aws ssm get-parameter --region us-east-1 --name ci.datadog-agent.docker_hub_login --with-decryption --query "Parameter.Value" --out text)
     - aws ssm get-parameter --region us-east-1 --name ci.datadog-agent.docker_hub_pwd --with-decryption --query "Parameter.Value" --out text | docker login --username "$DOCKER_REGISTRY_LOGIN" --password-stdin docker.io
     # Build and push
-    - DEVA_VERSION_ARG=$(grep DEVA_VERSION deva.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
+    - DDA_VERSION_ARG=$(grep DDA_VERSION dda.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
     - >-
       docker build dev-envs/$PLATFORM
       --build-arg ARCH=$BASE_IMAGE_ARCH
       --build-arg TAG=$BASE_IMAGE_TAG
-      $DEVA_VERSION_ARG
+      $DDA_VERSION_ARG
       --tag registry.ddbuild.io/ci/datadog-agent-buildimages/dev-env-$PLATFORM:$TARGET_IMAGE_ARCH
     - docker push registry.ddbuild.io/ci/datadog-agent-buildimages/dev-env-$PLATFORM:$TARGET_IMAGE_ARCH
 

diff --git a/.gitlab/devcontainer.yml b/.gitlab/devcontainer.yml
@@ -17,8 +17,8 @@ lint_devcontainer:
       - PLATFORM: [amd64, arm64]
   script:
     - GO_VERSION_ARG=$(grep GO_VERSION go.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
-    - DEVA_VERSION_ARG=$(grep DEVA_VERSION deva.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
-    - docker buildx build $GO_VERSION_ARG $DEVA_VERSION_ARG --no-cache --platform linux/${PLATFORM} --tag ${DOCKER_TARGET}-${PLATFORM} -f devcontainer/Dockerfile . ${PUSH}
+    - DDA_VERSION_ARG=$(grep DDA_VERSION dda.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
+    - docker buildx build $GO_VERSION_ARG $DDA_VERSION_ARG --no-cache --platform linux/${PLATFORM} --tag ${DOCKER_TARGET}-${PLATFORM} -f devcontainer/Dockerfile . ${PUSH}
 
 test_devcontainer:
   extends: .build_devcontainer

diff --git a/agent-deploy/Dockerfile b/agent-deploy/Dockerfile
@@ -15,8 +15,8 @@ ARG AWSCLI_VERSION_ARG=1.34.33
 ARG RPM_S3_VERSION_ARG=0.8.0
 ARG GO_VERSION
 ARG GO_SHA256_LINUX_AMD64
-ARG DEVA_VERSION
-ARG DEVA_NO_DYNAMIC_DEPS
+ARG DDA_VERSION
+ARG DDA_NO_DYNAMIC_DEPS
 ARG CI_UPLOADER_SHASUM=4e56d449e6396ae4c7356f07fc5372a28999aacb012d4343a3b8a9389123aa38
 ARG CI_UPLOADER_VERSION=2.38.1
 ARG PYTHON_VERSION=3.12.6
@@ -28,7 +28,7 @@ ENV RUBY_VERSION=$RUBY_VERSION_ARG \
     BUNDLER_VERSION=$BUNDLER_VERSION_ARG \
     AWSCLI_VERSION=$AWSCLI_VERSION_ARG \
     RPM_S3_VERSION=$RPM_S3_VERSION_ARG \
-    DEVA_NO_DYNAMIC_DEPS=$DEVA_NO_DYNAMIC_DEPS
+    DDA_NO_DYNAMIC_DEPS=$DDA_NO_DYNAMIC_DEPS
 
 # Remove the early return on non-interactive shells, which makes sourcing the file not activate conda
 RUN grep -v return /root/.bashrc >> /root/newbashrc && cp /root/newbashrc /root/.bashrc
@@ -96,8 +96,8 @@ RUN git clone --depth=1 https://github.com/pyenv/pyenv.git ${PYENV_ROOT} && \
 # Python 3 deps
 RUN pip3 install pip \
     && pip3 install --upgrade pip \
-    && pip3 install "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}" \
-    && deva -v self dep sync -f legacy-build -f legacy-agent-deploy \
+    && pip3 install "git+https://github.com/DataDog/datadog-agent-dev.git@${DDA_VERSION}" \
+    && dda -v self dep sync -f legacy-build -f legacy-agent-deploy \
     && pyenv rehash
 
 # External calls configuration

diff --git a/btf-gen/Dockerfile b/btf-gen/Dockerfile
@@ -2,8 +2,8 @@ FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 ARG PYTHON_VERSION=3.12.6
-ARG DEVA_VERSION
-ARG DEVA_NO_DYNAMIC_DEPS
+ARG DDA_VERSION
+ARG DDA_NO_DYNAMIC_DEPS
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
@@ -36,13 +36,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 # Python install
 ENV PYENV_ROOT="/.pyenv"
 ENV PATH="$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH"
-ENV DEVA_NO_DYNAMIC_DEPS=$DEVA_NO_DYNAMIC_DEPS
+ENV DDA_NO_DYNAMIC_DEPS=$DDA_NO_DYNAMIC_DEPS
 
 RUN git clone --depth=1 https://github.com/pyenv/pyenv.git ${PYENV_ROOT} && \
      pyenv install ${PYTHON_VERSION} && \
      pyenv global ${PYTHON_VERSION} && \
-     pip install "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}" && \
-     deva -v self dep sync -f legacy-build -f legacy-btf-gen && \
+     pip install "git+https://github.com/DataDog/datadog-agent-dev.git@${DDA_VERSION}" && \
+     dda -v self dep sync -f legacy-build -f legacy-btf-gen && \
      pyenv rehash
 
 COPY .awsconfig /root/.aws/config

diff --git a/build-container.ps1 b/build-container.ps1
@@ -39,8 +39,8 @@ foreach ($line in $lines) {
     $arglist += "$line"
 }
 
-# Read arguments from deva.env file
-$lines = Get-Content -Path 'deva.env'
+# Read arguments from dda.env file
+$lines = Get-Content -Path 'dda.env'
 foreach ($line in $lines) {
     $arglist += "--build-arg"
     $arglist += "$line"

diff --git a/circleci/Dockerfile b/circleci/Dockerfile
@@ -8,8 +8,8 @@ ENV DEBIAN_FRONTEND noninteractive
 
 ARG PYTHON_VERSION=3.12.6
 ARG CMAKE_VERSION=3.30.2
-ARG DEVA_VERSION
-ARG DEVA_NO_DYNAMIC_DEPS
+ARG DDA_VERSION
+ARG DDA_NO_DYNAMIC_DEPS
 
 # Pre-requisites
 # Python 3 dev is required for rtloader
@@ -85,13 +85,13 @@ RUN ./setup_codecov.sh
 # Python
 ENV PYENV_ROOT="/.pyenv"
 ENV PATH="$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH"
-ENV DEVA_NO_DYNAMIC_DEPS=$DEVA_NO_DYNAMIC_DEPS
+ENV DDA_NO_DYNAMIC_DEPS=$DDA_NO_DYNAMIC_DEPS
 
 RUN git clone --depth=1 https://github.com/pyenv/pyenv.git ${PYENV_ROOT} && \
      pyenv install ${PYTHON_VERSION} && \
      pyenv global ${PYTHON_VERSION} && \
-     pip3 install "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}" && \
-     deva -v self dep sync -f legacy-build -f legacy-circleci && \
+     pip3 install "git+https://github.com/DataDog/datadog-agent-dev.git@${DDA_VERSION}" && \
+     dda -v self dep sync -f legacy-build -f legacy-circleci && \
      pyenv rehash
 
 # External calls configuration

diff --git a/dd-agent-testing/Dockerfile b/dd-agent-testing/Dockerfile
@@ -3,8 +3,8 @@ FROM ruby:2.7.5-bullseye
 ENV BUNDLER_VERSION=1.17.3
 ARG CI_UPLOADER_VERSION=2.38.1
 ARG CI_UPLOADER_SHA=4e56d449e6396ae4c7356f07fc5372a28999aacb012d4343a3b8a9389123aa38
-ARG DEVA_VERSION
-ARG DEVA_NO_DYNAMIC_DEPS
+ARG DDA_VERSION
+ARG DDA_NO_DYNAMIC_DEPS
 ARG PYTHON_VERSION=3.12.6
 ARG VAULT_VERSION=1.17.2
 ARG VAULT_CHECKSUM=a0c0449e640c8be5dcf7b7b093d5884f6a85406dbb86bbad0ea06becad5aaab8
@@ -32,15 +32,15 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
 # Python install
 ENV PYENV_ROOT="/.pyenv"
 ENV PATH="$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH"
-ENV DEVA_NO_DYNAMIC_DEPS=$DEVA_NO_DYNAMIC_DEPS
+ENV DDA_NO_DYNAMIC_DEPS=$DDA_NO_DYNAMIC_DEPS
 
 RUN git clone --depth=1 https://github.com/pyenv/pyenv.git ${PYENV_ROOT} && \
      pyenv install ${PYTHON_VERSION} && \
      pyenv global ${PYTHON_VERSION}
 
 # Python
-RUN pip3 install "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}" \
- && deva -v self dep sync -f legacy-build \
+RUN pip3 install "git+https://github.com/DataDog/datadog-agent-dev.git@${DDA_VERSION}" \
+ && dda -v self dep sync -f legacy-build \
  && pyenv rehash
 
 # Ruby

diff --git a/dda.env b/dda.env
@@ -0,0 +1,2 @@
+DDA_VERSION=v0.5.0
+DDA_NO_DYNAMIC_DEPS=1
diff --git a/deb-arm/Dockerfile b/deb-arm/Dockerfile
@@ -19,8 +19,8 @@ FROM ${BASE_IMAGE}
 ARG GO_VERSION
 ARG GO_SHA256_LINUX_ARM64
 ARG GO_SHA256_LINUX_ARMV6L
-ARG DEVA_VERSION
-ARG DEVA_NO_DYNAMIC_DEPS=1
+ARG DDA_VERSION
+ARG DDA_NO_DYNAMIC_DEPS=1
 ARG CMAKE_VERSION=3.30.2
 ARG CMAKE_SHA256="8a6636e72a6ddfe50e0087472bff688f337df48b00a7728b12d7b70b5b459fc5"
 ARG CLANG_VERSION=8.0.0
@@ -107,8 +107,8 @@ ENV PATH "~/.cargo/bin:${PATH}"
 
 # CONDA
 COPY python-packages-versions.txt setup_python.sh /
-ENV DEVA_VERSION=$DEVA_VERSION
-ENV DEVA_NO_DYNAMIC_DEPS=$DEVA_NO_DYNAMIC_DEPS
+ENV DDA_VERSION=$DDA_VERSION
+ENV DDA_NO_DYNAMIC_DEPS=$DDA_NO_DYNAMIC_DEPS
 RUN ./setup_python.sh
 ENV PATH "${CONDA_PATH}/condabin:${PATH}"
 ENV PKG_CONFIG_LIBDIR "${PKG_CONFIG_LIBDIR}:${CONDA_PATH}/lib/pkgconfig"

diff --git a/deb-x64/Dockerfile b/deb-x64/Dockerfile
@@ -12,8 +12,8 @@ ARG GIT_VERSION=2.10.1
 ARG GIT_SHA256="78553f786f1a66cb68983c170be482558028a3376056c0f2ed366f331b1e35f2"
 ARG GO_VERSION
 ARG GO_SHA256_LINUX_AMD64
-ARG DEVA_VERSION
-ARG DEVA_NO_DYNAMIC_DEPS=1
+ARG DDA_VERSION
+ARG DDA_NO_DYNAMIC_DEPS=1
 ARG CMAKE_VERSION=3.30.2
 ARG CMAKE_SHA256="33f5a7680578481ce0403dc5a814afae613f2f6f88d632a3bda0f7ff5f4dedfc"
 ARG CLANG_VERSION=8.0.0
@@ -146,8 +146,8 @@ RUN curl -fsSL https://github.com/DataDog/datadog-ci/releases/download/v${CI_UPL
 
 # CONDA
 COPY python-packages-versions.txt setup_python.sh /
-ENV DEVA_VERSION=$DEVA_VERSION
-ENV DEVA_NO_DYNAMIC_DEPS=$DEVA_NO_DYNAMIC_DEPS
+ENV DDA_VERSION=$DDA_VERSION
+ENV DDA_NO_DYNAMIC_DEPS=$DDA_NO_DYNAMIC_DEPS
 RUN ./setup_python.sh
 ENV PATH "${CONDA_PATH}/condabin:${PATH}"
 ENV PKG_CONFIG_LIBDIR "${PKG_CONFIG_LIBDIR}:${CONDA_PATH}/lib/pkgconfig"

diff --git a/dev-envs/linux/Dockerfile b/dev-envs/linux/Dockerfile
@@ -2,10 +2,10 @@ ARG ARCH=arm64
 ARG TAG=latest
 FROM datadog/agent-buildimages-deb_${ARCH}:${TAG}
 
-ARG DEVA_VERSION
+ARG DDA_VERSION
 
 # Allow dynamic dependencies again as they are disabled in build images
-ENV DEVA_NO_DYNAMIC_DEPS=0
+ENV DDA_NO_DYNAMIC_DEPS=0
 
 # Set up scripts
 COPY scripts /root/.scripts
@@ -50,7 +50,7 @@ RUN /setup/git.sh
 
 # Set up Python
 COPY python.sh /setup/python.sh
-RUN DEVA_VERSION=${DEVA_VERSION} /setup/python.sh
+RUN DDA_VERSION=${DDA_VERSION} /setup/python.sh
 
 # Set up fonts
 COPY fonts.sh /setup/fonts.sh

diff --git a/dev-envs/linux/python.sh b/dev-envs/linux/python.sh
@@ -30,7 +30,7 @@ rm cpython.tar.gz
 
 /tools/python/bin/python -m venv "${HOME}/.venv"
 
-"${HOME}/.venv/bin/pip" install "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}"
-"${HOME}/.venv/bin/deva" -v self dep sync -f legacy-tasks
+"${HOME}/.venv/bin/pip" install "git+https://github.com/DataDog/datadog-agent-dev.git@${DDA_VERSION}"
+"${HOME}/.venv/bin/dda" -v self dep sync -f legacy-tasks
 
 path-prepend "${HOME}/.venv/bin"
diff --git a/deva.env b/deva.env
@@ -1,2 +1,2 @@
-DEVA_VERSION=v0.4.3
-DEVA_NO_DYNAMIC_DEPS=1
+DDA_VERSION=v0.5.0
+DDA_NO_DYNAMIC_DEPS=1
diff --git a/devcontainer/Dockerfile b/devcontainer/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:22.04
 
 ARG TARGETARCH
 ARG GO_VERSION
-ARG DEVA_VERSION
+ARG DDA_VERSION
 ARG PYTHON_VERSION=3.12
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DATADOG_AGENT_EMBEDDED_PATH=/opt/datadog-agent/embedded
@@ -31,8 +31,8 @@ RUN useradd -g 20 -u 503 -m datadog -s /bin/bash -G sudo,root && \
     echo 'datadog ALL=(ALL:ALL) NOPASSWD:ALL' > /etc/sudoers.d/datadog && \
     # Pin pyasn1 to 0.6.0 until the maintainers release a wheel for 0.6.1 version
     pip3 install --no-cache-dir pyasn1==0.6.0 && \
-    pip3 install --no-cache-dir "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}" && \
-    deva -v self dep sync -f legacy-tasks && \
+    pip3 install --no-cache-dir "git+https://github.com/DataDog/datadog-agent-dev.git@${DDA_VERSION}" && \
+    dda -v self dep sync -f legacy-tasks && \
     # Correct some permissions
     mkdir -p $DATADOG_AGENT_EMBEDDED_PATH && chown -R 503:20 $DATADOG_AGENT_EMBEDDED_PATH && \
     # Omnibus setup

diff --git a/docker-arm64/Dockerfile b/docker-arm64/Dockerfile
@@ -1,8 +1,8 @@
 FROM 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:20.10
 
 ARG PYTHON_VERSION=3.12.6
-ARG DEVA_VERSION
-ARG DEVA_NO_DYNAMIC_DEPS
+ARG DDA_VERSION
+ARG DDA_NO_DYNAMIC_DEPS
 ARG GO_VERSION
 ARG GO_SHA256_LINUX_ARM64
 ARG CI_UPLOADER_VERSION=2.38.1
@@ -35,14 +35,14 @@ RUN apt-get update &&  \
 # Python install
 ENV PYENV_ROOT="/.pyenv"
 ENV PATH="$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH"
-ENV DEVA_NO_DYNAMIC_DEPS=$DEVA_NO_DYNAMIC_DEPS
+ENV DDA_NO_DYNAMIC_DEPS=$DDA_NO_DYNAMIC_DEPS
 
 RUN git clone --depth=1 https://github.com/pyenv/pyenv.git ${PYENV_ROOT} && \
      pyenv install ${PYTHON_VERSION} && \
      pyenv global ${PYTHON_VERSION}
 
-RUN pip install "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}" \
- && deva -v self dep sync -f legacy-build \
+RUN pip install "git+https://github.com/DataDog/datadog-agent-dev.git@${DDA_VERSION}" \
+ && dda -v self dep sync -f legacy-build \
  && pyenv rehash
 
 # Install Go