Skip to content

[Backport 7.66.x] Rename 7-full-rc-full image to 7-rc-full #36443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2025

Conversation

agent-platform-auto-pr[bot]
Copy link
Contributor

Backport 4d22673 from #36432.


<!--

  • Contributors are encouraged to read our CONTRIBUTING documentation.
  • Both Contributor and Reviewer Checklists are available at https://datadoghq.dev/datadog-agent/guidelines/contributing/#pull-requests.
  • The pull request:
    • Should only fix one issue or add one feature at a time.
    • Must update the test suite for the relevant functionality.
    • Should pass all status checks before being reviewed or merged.
  • Commit titles should be prefixed with general area of pull request's change.
  • Please fill the below sections if possible with relevant information or links.
    -->

What does this PR do?

Rename 7-full-rc-full image to 7-rc-full

Motivation

Describe how you validated your changes

<!--
Validate your changes before merge, ensuring that:

  • Your PR is tested by static / unit / integrations / e2e tests
  • Your PR description details which e2e tests cover your changes, if any
  • The PR description contains details of how you validated your changes. If you validated changes manually and not through automated tests, add context on why automated tests did not fit your changes validation.

If you want additional validation by a second person, you can ask reviewers to do it. Describe how to set up an environment for manual tests in the PR description. Manual validation is expected to happen on every commit before merge.

Any manual validation step should then map to an automated test. Manual validation should not substitute automation, minus exceptions not supported by test tooling yet.
-->

Possible Drawbacks / Trade-offs

Additional Notes

<!--

  • Anything else we should know when reviewing?
  • Include benchmarking information here whenever possible.
  • Include info about alternatives that were considered and why the proposed
    version was chosen.
    -->

@agent-platform-auto-pr agent-platform-auto-pr bot requested review from a team as code owners April 24, 2025 16:25
@agent-platform-auto-pr agent-platform-auto-pr bot added changelog/no-changelog backport bot team/agent-delivery short review PR is simple enough to be reviewed quickly qa/rc-required Only for a PR that requires validation on the Release Candidate labels Apr 24, 2025
@agent-platform-auto-pr
Copy link
Contributor Author

Gitlab CI Configuration Changes

Updated: .gitlab-ci.yml

Modified Jobs

variables (configuration)
  variables:
    AGENT_API_KEY_ORG2: agent-api-key-org-2
    AGENT_APP_KEY_ORG2: agent-ci-app-key-org-2
    AGENT_BINARIES_DIR: bin/agent
    AGENT_GITHUB_APP: agent-github-app
    AGENT_QA_E2E: agent-qa-e2e
    API_KEY_ORG2: ci.datadog-agent.datadog_api_key_org2
    ARTIFACT_DOWNLOAD_ATTEMPTS: 2
    ATLASSIAN_WRITE: atlassian-write
    BTFHUB_ARCHIVE_BRANCH: main
    BUCKET_BRANCH: dev
    CHANGELOG_COMMIT_SHA: ci.datadog-agent.gitlab_changelog_commit_sha
    CHOCOLATEY_API_KEY: ci.datadog-agent.chocolatey_api_key
    CI_IMAGE_BTF_GEN: v62029117-1ba50f31
    CI_IMAGE_BTF_GEN_SUFFIX: ''
    CI_IMAGE_DD_AGENT_TESTING: v62029117-1ba50f31
    CI_IMAGE_DD_AGENT_TESTING_SUFFIX: ''
    CI_IMAGE_DEB_ARM64: v62029117-1ba50f31
    CI_IMAGE_DEB_ARM64_SUFFIX: ''
    CI_IMAGE_DEB_ARMHF: v62029117-1ba50f31
    CI_IMAGE_DEB_ARMHF_SUFFIX: ''
    CI_IMAGE_DEB_X64: v62029117-1ba50f31
    CI_IMAGE_DEB_X64_SUFFIX: ''
    CI_IMAGE_DOCKER_ARM64: v62029117-1ba50f31
    CI_IMAGE_DOCKER_ARM64_SUFFIX: ''
    CI_IMAGE_DOCKER_X64: v62029117-1ba50f31
    CI_IMAGE_DOCKER_X64_SUFFIX: ''
    CI_IMAGE_GITLAB_AGENT_DEPLOY: v62029117-1ba50f31
    CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: ''
    CI_IMAGE_LINUX_GLIBC_2_17_X64: v62029117-1ba50f31
    CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: ''
    CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v62029117-1ba50f31
    CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: ''
    CI_IMAGE_RPM_ARM64: v62029117-1ba50f31
    CI_IMAGE_RPM_ARM64_SUFFIX: ''
    CI_IMAGE_RPM_ARMHF: v62029117-1ba50f31
    CI_IMAGE_RPM_ARMHF_SUFFIX: ''
    CI_IMAGE_RPM_X64: v62029117-1ba50f31
    CI_IMAGE_RPM_X64_SUFFIX: ''
    CI_IMAGE_SYSTEM_PROBE_ARM64: v62029117-1ba50f31
    CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: ''
    CI_IMAGE_SYSTEM_PROBE_X64: v62029117-1ba50f31
    CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: ''
    CI_IMAGE_WIN_LTSC2022_X64: v62029117-1ba50f31
    CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: ''
    CLANG_BUILD_VERSION: v60409452-ee70de70
    CLANG_LLVM_VER: 12.0.1
    CLUSTER_AGENT_BINARIES_DIR: bin/datadog-cluster-agent
    CLUSTER_AGENT_CLOUDFOUNDRY_BINARIES_DIR: bin/datadog-cluster-agent-cloudfoundry
    CODECOV: codecov
    CODECOV_TOKEN: ci.datadog-agent.codecov_token
-   COMPARE_TO_BRANCH: main
?                      ^^^^
+   COMPARE_TO_BRANCH: 7.66.x
?                      ^^^^^^
    CWS_INSTRUMENTATION_BINARIES_DIR: bin/cws-instrumentation
    DATADOG_AGENT_ARMBUILDIMAGES: v62029117-1ba50f31
    DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ''
    DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v62029117-1ba50f31
    DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ''
    DATADOG_AGENT_BUILDIMAGES: v62029117-1ba50f31
    DATADOG_AGENT_BUILDIMAGES_SUFFIX: ''
    DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded
    DATADOG_AGENT_WINBUILDIMAGES: v62029117-1ba50f31
    DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ''
    DD_AGENT_TESTING_DIR: $CI_PROJECT_DIR/test/new-e2e/tests
    DD_PKG_VERSION: latest
    DEB_GPG_KEY: ci.datadog-agent.deb_signing_private_key_${DEB_GPG_KEY_ID}
    DEB_GPG_KEY_ID: c0962c7d
    DEB_GPG_KEY_NAME: Datadog, Inc. APT key
    DEB_RPM_TESTING_BUCKET_BRANCH: testing
    DEB_S3_BUCKET: apt.datad0g.com
    DEB_SIGNING_PASSPHRASE: ci.datadog-agent.deb_signing_key_passphrase_${DEB_GPG_KEY_ID}
    DEB_TESTING_S3_BUCKET: apttesting.datad0g.com
    DOCKER_REGISTRY_LOGIN: ci.datadog-agent.docker_hub_login
    DOCKER_REGISTRY_PWD: ci.datadog-agent.docker_hub_pwd
    DOCKER_REGISTRY_RO: dockerhub-readonly
    DOCKER_REGISTRY_URL: docker.io
    DOGSTATSD_BINARIES_DIR: bin/dogstatsd
    E2E_AZURE: e2e-azure
    E2E_GCP: e2e-gcp
    EXECUTOR_JOB_SECTION_ATTEMPTS: 2
    FF_KUBERNETES_HONOR_ENTRYPOINT: true
    FF_SCRIPT_SECTIONS: 1
    FF_TIMESTAMPS: true
-   FF_USE_FASTZIP: true
    GENERAL_ARTIFACTS_CACHE_BUCKET_URL: https://dd-agent-omnibus.s3.amazonaws.com
    GET_SOURCES_ATTEMPTS: 2
    GITLAB_TOKEN: gitlab-token
    GO_TEST_SKIP_FLAKE: 'true'
    INSTALLER_TESTING_S3_BUCKET: installtesting.datad0g.com
    INSTALL_SCRIPT_API_KEY_ORG2: install-script-api-key-org-2
    INTEGRATION_WHEELS_CACHE_BUCKET: dd-agent-omnibus
    KERNEL_MATRIX_TESTING_ARM_AMI_ID: ami-0b5f838a19d37fc61
    KERNEL_MATRIX_TESTING_X86_AMI_ID: ami-05b3973acf5422348
    KITCHEN_INFRASTRUCTURE_FLAKES_RETRY: 2
    MACOS_GITHUB_APP_1: macos-github-app-one
    MACOS_GITHUB_APP_2: macos-github-app-two
    MACOS_S3_BUCKET: dd-agent-macostesting
    OMNIBUS_BASE_DIR: /omnibus
    OMNIBUS_GIT_CACHE_DIR: /tmp/omnibus-git-cache
    OMNIBUS_PACKAGE_DIR: $CI_PROJECT_DIR/omnibus/pkg/
    OMNIBUS_PACKAGE_DIR_SUSE: $CI_PROJECT_DIR/omnibus/suse/pkg
-   OVERRIDE_GIT_STRATEGY: s3
    PIPELINE_KEY_ALIAS: alias/ci_datadog-agent_pipeline-key
    PROCESS_S3_BUCKET: datad0g-process-agent
    RELEASE_VERSION: nightly
    RESTORE_CACHE_ATTEMPTS: 2
    RPM_GPG_KEY: ci.datadog-agent.rpm_signing_private_key_${RPM_GPG_KEY_ID}
    RPM_GPG_KEY_ID: b01082d3
    RPM_GPG_KEY_NAME: Datadog, Inc. RPM key
    RPM_S3_BUCKET: yum.datad0g.com
    RPM_SIGNING_PASSPHRASE: ci.datadog-agent.rpm_signing_key_passphrase_${RPM_GPG_KEY_ID}
    RPM_TESTING_S3_BUCKET: yumtesting.datad0g.com
    RUN_E2E_TESTS: auto
    RUN_KMT_TESTS: auto
    RUN_UNIT_TESTS: auto
    S3_ARTIFACTS_URI: s3://dd-ci-artefacts-build-stable/$CI_PROJECT_NAME/$CI_PIPELINE_ID
    S3_CP_CMD: aws s3 cp $S3_CP_OPTIONS
    S3_CP_OPTIONS: --no-progress --region us-east-1 --sse AES256
    S3_DD_AGENT_OMNIBUS_BTFS_URI: s3://dd-agent-omnibus/btfs
    S3_DD_AGENT_OMNIBUS_JAVA_URI: s3://dd-agent-omnibus/openjdk
    S3_DD_AGENT_OMNIBUS_LLVM_URI: s3://dd-agent-omnibus/llvm
    S3_DSD6_URI: s3://dsd6-staging
    S3_OMNIBUS_CACHE_BUCKET: dd-ci-datadog-agent-omnibus-cache-build-stable
    S3_OMNIBUS_GIT_CACHE_BUCKET: dd-ci-datadog-agent-omnibus-git-cache-build-stable
    S3_PERMANENT_ARTIFACTS_URI: s3://dd-ci-persistent-artefacts-build-stable/$CI_PROJECT_NAME
    S3_PROJECT_ARTIFACTS_URI: s3://dd-ci-artefacts-build-stable/$CI_PROJECT_NAME
    S3_RELEASE_ARTIFACTS_URI: s3://dd-release-artifacts/$CI_PROJECT_NAME/$CI_PIPELINE_ID
    S3_RELEASE_INSTALLER_ARTIFACTS_URI: s3://dd-release-artifacts/datadog-installer/$CI_PIPELINE_ID
    S3_SBOM_STORAGE_URI: s3://sbom-root-us1-ddbuild-io/$CI_PROJECT_NAME/$CI_PIPELINE_ID
    SLACK_AGENT: slack-agent-ci
    SMP_ACCOUNT: smp
    STATIC_BINARIES_DIR: bin/static
    SYSTEM_PROBE_BINARIES_DIR: bin/system-probe
    VCPKG_BLOB_SAS_URL: ci.datadog-agent-buildimages.vcpkg_blob_sas_url
    WINDOWS_BUILDS_S3_BUCKET: $WIN_S3_BUCKET/builds
    WINDOWS_POWERSHELL_DIR: $CI_PROJECT_DIR/signed_scripts
    WINDOWS_TESTING_S3_BUCKET: pipelines/A7/$CI_PIPELINE_ID
    WINGET_PAT: ci.datadog-agent.winget_pat
    WIN_S3_BUCKET: dd-agent-mstesting
.lint_macos_gitlab
  .lint_macos_gitlab:
    before_script:
    - export AWS_RETRY_MODE=standard
    - export AWS_RETRY_MAX_ATTEMPTS=5
    - 'eval $(gimme $(cat .go-version))
  
      export GOPATH=$GOROOT
  
      '
-   - PYTHON_VERSION=$(python3 --version | awk '{print $2}')
+   - 'export PATH="$(pyenv root)/shims:$PATH"
+ 
+     eval "$(pyenv init -)"
+ 
+     eval "$(pyenv virtualenv-init -)"
+ 
+     '
+   - PYTHON_VERSION=3.12.6
    - VENV_NAME="datadog-agent-python-$PYTHON_VERSION"
    - VENV_PATH="$(pyenv root)/versions/$VENV_NAME"
    - echo "Using Python $PYTHON_VERSION..."
    - "# Check if the virtual environment directory exists\nif [ ! -d \"$VENV_PATH\"\
-     \ ]; then\n  echo \"Creating virtual environment '$VENV_NAME'...\"\n  pyenv virtualenv\
+     \ ]; then\n  # Install target python if necessary\n  if [ ! -d \"$(pyenv root)/versions/$PYTHON_VERSION\"\
+     \ ]; then\n    echo \"Installing Python $PYTHON_VERSION...\"\n    pyenv install\
-     \ \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual environment '$VENV_NAME'\
?                          ---------------  ^^^^           ^
+     \ \"$PYTHON_VERSION\"\n  fi\n\n  echo \"Creating virtual environment '$VENV_NAME'...\"\
?                            ^^^^^^           ^^^^^^^^^^                               +++ ++
+     \n  pyenv virtualenv \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual\
-     \ already exists. Skipping creation.\"\nfi\n"
+     \ environment '$VENV_NAME' already exists. Skipping creation.\"\nfi\n"
?      +++++++++++++++++++++++++
    - pyenv activate $VENV_NAME
+   - python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat
+     .dda/version)" --break-system-packages
+   - pyenv rehash
+   - python3 -m dda self dep sync -f legacy-tasks
+   - pyenv rehash
    - 'echo "Don''t forget to regularly delete Go unused versions. Here are the installed
      Go versions and their disk space on the runner:"
  
      echo "Go:"
  
      du -sh $HOME/.gimme/versions/*
  
      echo "To remove a Go version please run:"
  
      echo "gimme uninstall <version>"
  
      '
    - 'echo "Don''t forget to regularly delete Python unused versions. Here are the
      installed Python versions and their disk space on the runner:"
  
      echo "Python:"
  
      du -sh $(pyenv root)/versions/*
  
      echo "To remove a Python version please run:"
  
      echo "pyenv uninstall -f <version>"
  
      '
-   - python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat
-     .dda/version)" --break-system-packages
-   - python3 -m dda self dep sync -f legacy-tasks
-   - pyenv rehash
    - dda inv -- -e rtloader.make
    - dda inv -- -e rtloader.install
    - dda inv -- -e install-tools
    needs:
    - go_deps
    - go_tools_deps
    script:
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache.tar.xz
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache_tools.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache_tools.tar.xz
    - dda inv -- -e linter.go --cpus 12 --debug --timeout 60
    stage: lint
.macos_gitlab
  .macos_gitlab:
    before_script:
    - export AWS_RETRY_MODE=standard
    - export AWS_RETRY_MAX_ATTEMPTS=5
    - 'eval $(gimme $(cat .go-version))
  
      export GOPATH=$GOROOT
  
      '
-   - PYTHON_VERSION=$(python3 --version | awk '{print $2}')
+   - 'export PATH="$(pyenv root)/shims:$PATH"
+ 
+     eval "$(pyenv init -)"
+ 
+     eval "$(pyenv virtualenv-init -)"
+ 
+     '
+   - PYTHON_VERSION=3.12.6
    - VENV_NAME="datadog-agent-python-$PYTHON_VERSION"
    - VENV_PATH="$(pyenv root)/versions/$VENV_NAME"
    - echo "Using Python $PYTHON_VERSION..."
    - "# Check if the virtual environment directory exists\nif [ ! -d \"$VENV_PATH\"\
-     \ ]; then\n  echo \"Creating virtual environment '$VENV_NAME'...\"\n  pyenv virtualenv\
+     \ ]; then\n  # Install target python if necessary\n  if [ ! -d \"$(pyenv root)/versions/$PYTHON_VERSION\"\
+     \ ]; then\n    echo \"Installing Python $PYTHON_VERSION...\"\n    pyenv install\
-     \ \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual environment '$VENV_NAME'\
?                          ---------------  ^^^^           ^
+     \ \"$PYTHON_VERSION\"\n  fi\n\n  echo \"Creating virtual environment '$VENV_NAME'...\"\
?                            ^^^^^^           ^^^^^^^^^^                               +++ ++
+     \n  pyenv virtualenv \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual\
-     \ already exists. Skipping creation.\"\nfi\n"
+     \ environment '$VENV_NAME' already exists. Skipping creation.\"\nfi\n"
?      +++++++++++++++++++++++++
    - pyenv activate $VENV_NAME
+   - python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat
+     .dda/version)" --break-system-packages
+   - pyenv rehash
+   - python3 -m dda self dep sync -f legacy-tasks
+   - pyenv rehash
    - 'echo "Don''t forget to regularly delete Go unused versions. Here are the installed
      Go versions and their disk space on the runner:"
  
      echo "Go:"
  
      du -sh $HOME/.gimme/versions/*
  
      echo "To remove a Go version please run:"
  
      echo "gimme uninstall <version>"
  
      '
    - 'echo "Don''t forget to regularly delete Python unused versions. Here are the
      installed Python versions and their disk space on the runner:"
  
      echo "Python:"
  
      du -sh $(pyenv root)/versions/*
  
      echo "To remove a Python version please run:"
  
      echo "pyenv uninstall -f <version>"
  
      '
-   - python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat
-     .dda/version)" --break-system-packages
-   - python3 -m dda self dep sync -f legacy-tasks
-   - pyenv rehash
    - dda inv -- -e rtloader.make
    - dda inv -- -e rtloader.install
    - dda inv -- -e install-tools
.select_python_env_commands
  .select_python_env_commands:
- - PYTHON_VERSION=$(python3 --version | awk '{print $2}')
+ - 'export PATH="$(pyenv root)/shims:$PATH"
+ 
+   eval "$(pyenv init -)"
+ 
+   eval "$(pyenv virtualenv-init -)"
+ 
+   '
+ - PYTHON_VERSION=3.12.6
  - VENV_NAME="datadog-agent-python-$PYTHON_VERSION"
  - VENV_PATH="$(pyenv root)/versions/$VENV_NAME"
  - echo "Using Python $PYTHON_VERSION..."
  - "# Check if the virtual environment directory exists\nif [ ! -d \"$VENV_PATH\" ];\
-   \ then\n  echo \"Creating virtual environment '$VENV_NAME'...\"\n  pyenv virtualenv\
+   \ then\n  # Install target python if necessary\n  if [ ! -d \"$(pyenv root)/versions/$PYTHON_VERSION\"\
+   \ ]; then\n    echo \"Installing Python $PYTHON_VERSION...\"\n    pyenv install\
-   \ \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual environment '$VENV_NAME'\
?                        ---------------  ^^^^           ^
+   \ \"$PYTHON_VERSION\"\n  fi\n\n  echo \"Creating virtual environment '$VENV_NAME'...\"\
?                          ^^^^^^           ^^^^^^^^^^                               +++ ++
+   \n  pyenv virtualenv \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual\
-   \ already exists. Skipping creation.\"\nfi\n"
+   \ environment '$VENV_NAME' already exists. Skipping creation.\"\nfi\n"
?    +++++++++++++++++++++++++
  - pyenv activate $VENV_NAME
.tests_macos_gitlab
  .tests_macos_gitlab:
    artifacts:
      expire_in: 2 weeks
      paths:
      - $TEST_OUTPUT_FILE
      - junit-*.tgz
      reports:
        annotations:
        - $EXTERNAL_LINKS_PATH
        junit: '**/junit-out-*.xml'
      when: always
    before_script:
    - export AWS_RETRY_MODE=standard
    - export AWS_RETRY_MAX_ATTEMPTS=5
    - 'eval $(gimme $(cat .go-version))
  
      export GOPATH=$GOROOT
  
      '
-   - PYTHON_VERSION=$(python3 --version | awk '{print $2}')
+   - 'export PATH="$(pyenv root)/shims:$PATH"
+ 
+     eval "$(pyenv init -)"
+ 
+     eval "$(pyenv virtualenv-init -)"
+ 
+     '
+   - PYTHON_VERSION=3.12.6
    - VENV_NAME="datadog-agent-python-$PYTHON_VERSION"
    - VENV_PATH="$(pyenv root)/versions/$VENV_NAME"
    - echo "Using Python $PYTHON_VERSION..."
    - "# Check if the virtual environment directory exists\nif [ ! -d \"$VENV_PATH\"\
-     \ ]; then\n  echo \"Creating virtual environment '$VENV_NAME'...\"\n  pyenv virtualenv\
+     \ ]; then\n  # Install target python if necessary\n  if [ ! -d \"$(pyenv root)/versions/$PYTHON_VERSION\"\
+     \ ]; then\n    echo \"Installing Python $PYTHON_VERSION...\"\n    pyenv install\
-     \ \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual environment '$VENV_NAME'\
?                          ---------------  ^^^^           ^
+     \ \"$PYTHON_VERSION\"\n  fi\n\n  echo \"Creating virtual environment '$VENV_NAME'...\"\
?                            ^^^^^^           ^^^^^^^^^^                               +++ ++
+     \n  pyenv virtualenv \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual\
-     \ already exists. Skipping creation.\"\nfi\n"
+     \ environment '$VENV_NAME' already exists. Skipping creation.\"\nfi\n"
?      +++++++++++++++++++++++++
    - pyenv activate $VENV_NAME
+   - python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat
+     .dda/version)" --break-system-packages
+   - pyenv rehash
+   - python3 -m dda self dep sync -f legacy-tasks
+   - pyenv rehash
    - 'echo "Don''t forget to regularly delete Go unused versions. Here are the installed
      Go versions and their disk space on the runner:"
  
      echo "Go:"
  
      du -sh $HOME/.gimme/versions/*
  
      echo "To remove a Go version please run:"
  
      echo "gimme uninstall <version>"
  
      '
    - 'echo "Don''t forget to regularly delete Python unused versions. Here are the
      installed Python versions and their disk space on the runner:"
  
      echo "Python:"
  
      du -sh $(pyenv root)/versions/*
  
      echo "To remove a Python version please run:"
  
      echo "pyenv uninstall -f <version>"
  
      '
-   - python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat
-     .dda/version)" --break-system-packages
-   - python3 -m dda self dep sync -f legacy-tasks
-   - pyenv rehash
    - dda inv -- -e rtloader.make
    - dda inv -- -e rtloader.install
    - dda inv -- -e install-tools
    needs:
    - go_deps
    - go_tools_deps
    rules:
    - if: $RUN_UNIT_TESTS == "off"
      when: never
    - if: $CI_COMMIT_BRANCH == "main"
      variables:
        COVERAGE_CACHE_FLAG: --push-coverage-cache
        FAST_TESTS: 'false'
    - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.[0-9]+\.x$/
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - if: $CI_COMMIT_TAG != null
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - if: $CI_PIPELINE_SOURCE == "trigger" || $CI_PIPELINE_SOURCE == "pipeline"
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - if: $RUN_UNIT_TESTS == "on"
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - variables:
        COVERAGE_CACHE_FLAG: --pull-coverage-cache
        FAST_TESTS: 'true'
    script:
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache.tar.xz
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache_tools.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache_tools.tar.xz
    - dda inv -- -e gitlab.generate-ci-visibility-links --output=$EXTERNAL_LINKS_PATH
    - FAST_TESTS_FLAG=""
    - if [[ "$FAST_TESTS" == "true" ]]; then FAST_TESTS_FLAG="--only-impacted-packages";
      fi
    - dda inv -- -e test --rerun-fails=2 --race --profile --cpus 12 --result-json $TEST_OUTPUT_FILE
      --junit-tar "junit-${CI_JOB_NAME}.tgz" $FAST_TESTS_FLAG --test-washer --coverage
    - dda inv -- -e invoke-unit-tests
    stage: source_test
    variables:
      FLAKY_PATTERNS_CONFIG: $CI_PROJECT_DIR/flaky-patterns-runtime.yaml
      TEST_OUTPUT_FILE: test_output.json
lint_macos_gitlab_amd64
  lint_macos_gitlab_amd64:
    before_script:
    - export AWS_RETRY_MODE=standard
    - export AWS_RETRY_MAX_ATTEMPTS=5
    - 'eval $(gimme $(cat .go-version))
  
      export GOPATH=$GOROOT
  
      '
-   - PYTHON_VERSION=$(python3 --version | awk '{print $2}')
+   - 'export PATH="$(pyenv root)/shims:$PATH"
+ 
+     eval "$(pyenv init -)"
+ 
+     eval "$(pyenv virtualenv-init -)"
+ 
+     '
+   - PYTHON_VERSION=3.12.6
    - VENV_NAME="datadog-agent-python-$PYTHON_VERSION"
    - VENV_PATH="$(pyenv root)/versions/$VENV_NAME"
    - echo "Using Python $PYTHON_VERSION..."
    - "# Check if the virtual environment directory exists\nif [ ! -d \"$VENV_PATH\"\
-     \ ]; then\n  echo \"Creating virtual environment '$VENV_NAME'...\"\n  pyenv virtualenv\
+     \ ]; then\n  # Install target python if necessary\n  if [ ! -d \"$(pyenv root)/versions/$PYTHON_VERSION\"\
+     \ ]; then\n    echo \"Installing Python $PYTHON_VERSION...\"\n    pyenv install\
-     \ \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual environment '$VENV_NAME'\
?                          ---------------  ^^^^           ^
+     \ \"$PYTHON_VERSION\"\n  fi\n\n  echo \"Creating virtual environment '$VENV_NAME'...\"\
?                            ^^^^^^           ^^^^^^^^^^                               +++ ++
+     \n  pyenv virtualenv \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual\
-     \ already exists. Skipping creation.\"\nfi\n"
+     \ environment '$VENV_NAME' already exists. Skipping creation.\"\nfi\n"
?      +++++++++++++++++++++++++
    - pyenv activate $VENV_NAME
+   - python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat
+     .dda/version)" --break-system-packages
+   - pyenv rehash
+   - python3 -m dda self dep sync -f legacy-tasks
+   - pyenv rehash
    - 'echo "Don''t forget to regularly delete Go unused versions. Here are the installed
      Go versions and their disk space on the runner:"
  
      echo "Go:"
  
      du -sh $HOME/.gimme/versions/*
  
      echo "To remove a Go version please run:"
  
      echo "gimme uninstall <version>"
  
      '
    - 'echo "Don''t forget to regularly delete Python unused versions. Here are the
      installed Python versions and their disk space on the runner:"
  
      echo "Python:"
  
      du -sh $(pyenv root)/versions/*
  
      echo "To remove a Python version please run:"
  
      echo "pyenv uninstall -f <version>"
  
      '
-   - python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat
-     .dda/version)" --break-system-packages
-   - python3 -m dda self dep sync -f legacy-tasks
-   - pyenv rehash
    - dda inv -- -e rtloader.make
    - dda inv -- -e rtloader.install
    - dda inv -- -e install-tools
    needs:
    - go_deps
    - go_tools_deps
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache.tar.xz
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache_tools.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache_tools.tar.xz
    - dda inv -- -e linter.go --cpus 12 --debug --timeout 60
    stage: lint
    tags:
    - macos:ventura-amd64
    - specific:true
lint_macos_gitlab_arm64
  lint_macos_gitlab_arm64:
    allow_failure: true
    before_script:
    - export AWS_RETRY_MODE=standard
    - export AWS_RETRY_MAX_ATTEMPTS=5
    - 'eval $(gimme $(cat .go-version))
  
      export GOPATH=$GOROOT
  
      '
-   - PYTHON_VERSION=$(python3 --version | awk '{print $2}')
+   - 'export PATH="$(pyenv root)/shims:$PATH"
+ 
+     eval "$(pyenv init -)"
+ 
+     eval "$(pyenv virtualenv-init -)"
+ 
+     '
+   - PYTHON_VERSION=3.12.6
    - VENV_NAME="datadog-agent-python-$PYTHON_VERSION"
    - VENV_PATH="$(pyenv root)/versions/$VENV_NAME"
    - echo "Using Python $PYTHON_VERSION..."
    - "# Check if the virtual environment directory exists\nif [ ! -d \"$VENV_PATH\"\
-     \ ]; then\n  echo \"Creating virtual environment '$VENV_NAME'...\"\n  pyenv virtualenv\
+     \ ]; then\n  # Install target python if necessary\n  if [ ! -d \"$(pyenv root)/versions/$PYTHON_VERSION\"\
+     \ ]; then\n    echo \"Installing Python $PYTHON_VERSION...\"\n    pyenv install\
-     \ \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual environment '$VENV_NAME'\
?                          ---------------  ^^^^           ^
+     \ \"$PYTHON_VERSION\"\n  fi\n\n  echo \"Creating virtual environment '$VENV_NAME'...\"\
?                            ^^^^^^           ^^^^^^^^^^                               +++ ++
+     \n  pyenv virtualenv \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual\
-     \ already exists. Skipping creation.\"\nfi\n"
+     \ environment '$VENV_NAME' already exists. Skipping creation.\"\nfi\n"
?      +++++++++++++++++++++++++
    - pyenv activate $VENV_NAME
+   - python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat
+     .dda/version)" --break-system-packages
+   - pyenv rehash
+   - python3 -m dda self dep sync -f legacy-tasks
+   - pyenv rehash
    - 'echo "Don''t forget to regularly delete Go unused versions. Here are the installed
      Go versions and their disk space on the runner:"
  
      echo "Go:"
  
      du -sh $HOME/.gimme/versions/*
  
      echo "To remove a Go version please run:"
  
      echo "gimme uninstall <version>"
  
      '
    - 'echo "Don''t forget to regularly delete Python unused versions. Here are the
      installed Python versions and their disk space on the runner:"
  
      echo "Python:"
  
      du -sh $(pyenv root)/versions/*
  
      echo "To remove a Python version please run:"
  
      echo "pyenv uninstall -f <version>"
  
      '
-   - python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat
-     .dda/version)" --break-system-packages
-   - python3 -m dda self dep sync -f legacy-tasks
-   - pyenv rehash
    - dda inv -- -e rtloader.make
    - dda inv -- -e rtloader.install
    - dda inv -- -e install-tools
    needs:
    - go_deps
    - go_tools_deps
    rules:
    - if: $CI_COMMIT_BRANCH == "main"
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - allow_failure: true
      when: manual
    script:
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache.tar.xz
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache_tools.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache_tools.tar.xz
    - dda inv -- -e linter.go --cpus 12 --debug --timeout 60
    stage: lint
    tags:
    - macos:ventura-arm64
    - specific:true
tests_macos_gitlab_amd64
  tests_macos_gitlab_amd64:
    after_script:
    - export VAULT_ADDR=https://vault.us1.ddbuild.io
    - vault login -method=aws -no-print
-   - PYTHON_VERSION=$(python3 --version | awk '{print $2}')
+   - 'export PATH="$(pyenv root)/shims:$PATH"
+ 
+     eval "$(pyenv init -)"
+ 
+     eval "$(pyenv virtualenv-init -)"
+ 
+     '
+   - PYTHON_VERSION=3.12.6
    - VENV_NAME="datadog-agent-python-$PYTHON_VERSION"
    - VENV_PATH="$(pyenv root)/versions/$VENV_NAME"
    - echo "Using Python $PYTHON_VERSION..."
    - "# Check if the virtual environment directory exists\nif [ ! -d \"$VENV_PATH\"\
-     \ ]; then\n  echo \"Creating virtual environment '$VENV_NAME'...\"\n  pyenv virtualenv\
+     \ ]; then\n  # Install target python if necessary\n  if [ ! -d \"$(pyenv root)/versions/$PYTHON_VERSION\"\
+     \ ]; then\n    echo \"Installing Python $PYTHON_VERSION...\"\n    pyenv install\
-     \ \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual environment '$VENV_NAME'\
?                          ---------------  ^^^^           ^
+     \ \"$PYTHON_VERSION\"\n  fi\n\n  echo \"Creating virtual environment '$VENV_NAME'...\"\
?                            ^^^^^^           ^^^^^^^^^^                               +++ ++
+     \n  pyenv virtualenv \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual\
-     \ already exists. Skipping creation.\"\nfi\n"
+     \ environment '$VENV_NAME' already exists. Skipping creation.\"\nfi\n"
?      +++++++++++++++++++++++++
    - pyenv activate $VENV_NAME
    - $CI_PROJECT_DIR/tools/ci/junit_upload.sh
    - CODECOV_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $CODECOV token) || exit
      $?; export CODECOV_TOKEN
    - dda inv -- -e coverage.upload-to-codecov $COVERAGE_CACHE_FLAG || true
    artifacts:
      expire_in: 2 weeks
      paths:
      - $TEST_OUTPUT_FILE
      - junit-*.tgz
      reports:
        annotations:
        - $EXTERNAL_LINKS_PATH
        junit:
        - '**/junit-out-*.xml'
      when: always
    before_script:
    - export AWS_RETRY_MODE=standard
    - export AWS_RETRY_MAX_ATTEMPTS=5
    - 'eval $(gimme $(cat .go-version))
  
      export GOPATH=$GOROOT
  
      '
-   - PYTHON_VERSION=$(python3 --version | awk '{print $2}')
+   - 'export PATH="$(pyenv root)/shims:$PATH"
+ 
+     eval "$(pyenv init -)"
+ 
+     eval "$(pyenv virtualenv-init -)"
+ 
+     '
+   - PYTHON_VERSION=3.12.6
    - VENV_NAME="datadog-agent-python-$PYTHON_VERSION"
    - VENV_PATH="$(pyenv root)/versions/$VENV_NAME"
    - echo "Using Python $PYTHON_VERSION..."
    - "# Check if the virtual environment directory exists\nif [ ! -d \"$VENV_PATH\"\
-     \ ]; then\n  echo \"Creating virtual environment '$VENV_NAME'...\"\n  pyenv virtualenv\
+     \ ]; then\n  # Install target python if necessary\n  if [ ! -d \"$(pyenv root)/versions/$PYTHON_VERSION\"\
+     \ ]; then\n    echo \"Installing Python $PYTHON_VERSION...\"\n    pyenv install\
-     \ \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual environment '$VENV_NAME'\
?                          ---------------  ^^^^           ^
+     \ \"$PYTHON_VERSION\"\n  fi\n\n  echo \"Creating virtual environment '$VENV_NAME'...\"\
?                            ^^^^^^           ^^^^^^^^^^                               +++ ++
+     \n  pyenv virtualenv \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual\
-     \ already exists. Skipping creation.\"\nfi\n"
+     \ environment '$VENV_NAME' already exists. Skipping creation.\"\nfi\n"
?      +++++++++++++++++++++++++
    - pyenv activate $VENV_NAME
+   - python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat
+     .dda/version)" --break-system-packages
+   - pyenv rehash
+   - python3 -m dda self dep sync -f legacy-tasks
+   - pyenv rehash
    - 'echo "Don''t forget to regularly delete Go unused versions. Here are the installed
      Go versions and their disk space on the runner:"
  
      echo "Go:"
  
      du -sh $HOME/.gimme/versions/*
  
      echo "To remove a Go version please run:"
  
      echo "gimme uninstall <version>"
  
      '
    - 'echo "Don''t forget to regularly delete Python unused versions. Here are the
      installed Python versions and their disk space on the runner:"
  
      echo "Python:"
  
      du -sh $(pyenv root)/versions/*
  
      echo "To remove a Python version please run:"
  
      echo "pyenv uninstall -f <version>"
  
      '
-   - python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat
-     .dda/version)" --break-system-packages
-   - python3 -m dda self dep sync -f legacy-tasks
-   - pyenv rehash
    - dda inv -- -e rtloader.make
    - dda inv -- -e rtloader.install
    - dda inv -- -e install-tools
    needs:
    - go_deps
    - go_tools_deps
    rules:
    - if: $RUN_UNIT_TESTS == "off"
      when: never
    - if: $CI_COMMIT_BRANCH == "main"
      variables:
        COVERAGE_CACHE_FLAG: --push-coverage-cache
        FAST_TESTS: 'false'
    - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.[0-9]+\.x$/
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - if: $CI_COMMIT_TAG != null
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - if: $CI_PIPELINE_SOURCE == "trigger" || $CI_PIPELINE_SOURCE == "pipeline"
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - if: $RUN_UNIT_TESTS == "on"
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - variables:
        COVERAGE_CACHE_FLAG: --pull-coverage-cache
        FAST_TESTS: 'true'
    script:
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache.tar.xz
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache_tools.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache_tools.tar.xz
    - dda inv -- -e gitlab.generate-ci-visibility-links --output=$EXTERNAL_LINKS_PATH
    - FAST_TESTS_FLAG=""
    - if [[ "$FAST_TESTS" == "true" ]]; then FAST_TESTS_FLAG="--only-impacted-packages";
      fi
    - dda inv -- -e test --rerun-fails=2 --race --profile --cpus 12 --result-json $TEST_OUTPUT_FILE
      --junit-tar "junit-${CI_JOB_NAME}.tgz" $FAST_TESTS_FLAG --test-washer --coverage
    - dda inv -- -e invoke-unit-tests
    stage: source_test
    tags:
    - macos:ventura-amd64
    - specific:true
    variables:
      FLAKY_PATTERNS_CONFIG: $CI_PROJECT_DIR/flaky-patterns-runtime.yaml
      TEST_OUTPUT_FILE: test_output.json
tests_macos_gitlab_arm64
  tests_macos_gitlab_arm64:
    after_script:
    - export VAULT_ADDR=https://vault.us1.ddbuild.io
    - vault login -method=aws -no-print
-   - PYTHON_VERSION=$(python3 --version | awk '{print $2}')
+   - 'export PATH="$(pyenv root)/shims:$PATH"
+ 
+     eval "$(pyenv init -)"
+ 
+     eval "$(pyenv virtualenv-init -)"
+ 
+     '
+   - PYTHON_VERSION=3.12.6
    - VENV_NAME="datadog-agent-python-$PYTHON_VERSION"
    - VENV_PATH="$(pyenv root)/versions/$VENV_NAME"
    - echo "Using Python $PYTHON_VERSION..."
    - "# Check if the virtual environment directory exists\nif [ ! -d \"$VENV_PATH\"\
-     \ ]; then\n  echo \"Creating virtual environment '$VENV_NAME'...\"\n  pyenv virtualenv\
+     \ ]; then\n  # Install target python if necessary\n  if [ ! -d \"$(pyenv root)/versions/$PYTHON_VERSION\"\
+     \ ]; then\n    echo \"Installing Python $PYTHON_VERSION...\"\n    pyenv install\
-     \ \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual environment '$VENV_NAME'\
?                          ---------------  ^^^^           ^
+     \ \"$PYTHON_VERSION\"\n  fi\n\n  echo \"Creating virtual environment '$VENV_NAME'...\"\
?                            ^^^^^^           ^^^^^^^^^^                               +++ ++
+     \n  pyenv virtualenv \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual\
-     \ already exists. Skipping creation.\"\nfi\n"
+     \ environment '$VENV_NAME' already exists. Skipping creation.\"\nfi\n"
?      +++++++++++++++++++++++++
    - pyenv activate $VENV_NAME
    - $CI_PROJECT_DIR/tools/ci/junit_upload.sh
    - CODECOV_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $CODECOV token) || exit
      $?; export CODECOV_TOKEN
    - dda inv -- -e coverage.upload-to-codecov $COVERAGE_CACHE_FLAG || true
    allow_failure: true
    artifacts:
      expire_in: 2 weeks
      paths:
      - $TEST_OUTPUT_FILE
      - junit-*.tgz
      reports:
        annotations:
        - $EXTERNAL_LINKS_PATH
        junit:
        - '**/junit-out-*.xml'
      when: always
    before_script:
    - export AWS_RETRY_MODE=standard
    - export AWS_RETRY_MAX_ATTEMPTS=5
    - 'eval $(gimme $(cat .go-version))
  
      export GOPATH=$GOROOT
  
      '
-   - PYTHON_VERSION=$(python3 --version | awk '{print $2}')
+   - 'export PATH="$(pyenv root)/shims:$PATH"
+ 
+     eval "$(pyenv init -)"
+ 
+     eval "$(pyenv virtualenv-init -)"
+ 
+     '
+   - PYTHON_VERSION=3.12.6
    - VENV_NAME="datadog-agent-python-$PYTHON_VERSION"
    - VENV_PATH="$(pyenv root)/versions/$VENV_NAME"
    - echo "Using Python $PYTHON_VERSION..."
    - "# Check if the virtual environment directory exists\nif [ ! -d \"$VENV_PATH\"\
-     \ ]; then\n  echo \"Creating virtual environment '$VENV_NAME'...\"\n  pyenv virtualenv\
+     \ ]; then\n  # Install target python if necessary\n  if [ ! -d \"$(pyenv root)/versions/$PYTHON_VERSION\"\
+     \ ]; then\n    echo \"Installing Python $PYTHON_VERSION...\"\n    pyenv install\
-     \ \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual environment '$VENV_NAME'\
?                          ---------------  ^^^^           ^
+     \ \"$PYTHON_VERSION\"\n  fi\n\n  echo \"Creating virtual environment '$VENV_NAME'...\"\
?                            ^^^^^^           ^^^^^^^^^^                               +++ ++
+     \n  pyenv virtualenv \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual\
-     \ already exists. Skipping creation.\"\nfi\n"
+     \ environment '$VENV_NAME' already exists. Skipping creation.\"\nfi\n"
?      +++++++++++++++++++++++++
    - pyenv activate $VENV_NAME
+   - python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat
+     .dda/version)" --break-system-packages
+   - pyenv rehash
+   - python3 -m dda self dep sync -f legacy-tasks
+   - pyenv rehash
    - 'echo "Don''t forget to regularly delete Go unused versions. Here are the installed
      Go versions and their disk space on the runner:"
  
      echo "Go:"
  
      du -sh $HOME/.gimme/versions/*
  
      echo "To remove a Go version please run:"
  
      echo "gimme uninstall <version>"
  
      '
    - 'echo "Don''t forget to regularly delete Python unused versions. Here are the
      installed Python versions and their disk space on the runner:"
  
      echo "Python:"
  
      du -sh $(pyenv root)/versions/*
  
      echo "To remove a Python version please run:"
  
      echo "pyenv uninstall -f <version>"
  
      '
-   - python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat
-     .dda/version)" --break-system-packages
-   - python3 -m dda self dep sync -f legacy-tasks
-   - pyenv rehash
    - dda inv -- -e rtloader.make
    - dda inv -- -e rtloader.install
    - dda inv -- -e install-tools
    needs:
    - go_deps
    - go_tools_deps
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - allow_failure: true
      when: manual
    script:
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache.tar.xz
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache_tools.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache_tools.tar.xz
    - dda inv -- -e gitlab.generate-ci-visibility-links --output=$EXTERNAL_LINKS_PATH
    - FAST_TESTS_FLAG=""
    - if [[ "$FAST_TESTS" == "true" ]]; then FAST_TESTS_FLAG="--only-impacted-packages";
      fi
    - dda inv -- -e test --rerun-fails=2 --race --profile --cpus 12 --result-json $TEST_OUTPUT_FILE
      --junit-tar "junit-${CI_JOB_NAME}.tgz" $FAST_TESTS_FLAG --test-washer --coverage
    - dda inv -- -e invoke-unit-tests
    stage: source_test
    tags:
    - macos:ventura-arm64
    - specific:true
    variables:
      FLAKY_PATTERNS_CONFIG: $CI_PROJECT_DIR/flaky-patterns-runtime.yaml
      TEST_OUTPUT_FILE: test_output.json

Added Jobs

.install_python_dependencies
.install_python_dependencies:
- python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat
  .dda/version)" --break-system-packages
- pyenv rehash
- python3 -m dda self dep sync -f legacy-tasks
- pyenv rehash

Removed Jobs

  • clone

Changes Summary

Removed Modified Added Renamed
1 9 1 0

Updated: .gitlab/deploy_containers/deploy_containers_a7.yml

Modified Jobs

deploy_containers-a7-full-rc
  deploy_containers-a7-full-rc:
    before_script:
    - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --url-safe --pipeline-id
      $PARENT_PIPELINE_ID)" || exit $?; fi
    - export IMG_BASE_SRC="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
    - export IMG_LINUX_SOURCES="${IMG_BASE_SRC}-7-full-amd64,${IMG_BASE_SRC}-7-full-arm64"
    - export IMG_WINDOWS_SOURCES="${IMG_BASE_SRC}-7-jmx-win1809-amd64,${IMG_BASE_SRC}-7-jmx-winltsc2022-amd64"
    - export IMG_SOURCES="${IMG_LINUX_SOURCES},${IMG_WINDOWS_SOURCES}"
    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}-full"
    dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    rules:
    - allow_failure: true
      if: $FORCE_MANUAL == "true" && $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
      variables:
        AGENT_REPOSITORY: agent
        DSD_REPOSITORY: dogstatsd
        IMG_REGISTRIES: public
      when: manual
    - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
      variables:
        AGENT_REPOSITORY: agent
        DSD_REPOSITORY: dogstatsd
        IMG_REGISTRIES: public
      when: on_success
    script:
    - GITLAB_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $GITLAB_TOKEN write_api)
      || exit $?; export GITLAB_TOKEN
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMG_SOURCES\" =~ \"$SRC_AGENT\"\
      \ || \"$IMG_SOURCES\" =~ \"$SRC_DCA\" || \"$IMG_SOURCES\" =~ \"$SRC_CWS_INSTRUMENTATION\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_AGENT\" || \"$IMG_VARIABLES\" =~ \"$SRC_DCA\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_CWS_INSTRUMENTATION\" ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"\
      -nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=\"${CI_COMMIT_TAG+-release}\"\n\
      fi\n"
    - IMG_VARIABLES="$(sed -E "s#(${SRC_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_VARIABLES")"
    - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_SOURCES")"
    - dda inv pipeline.trigger-child-pipeline --project-name DataDog/public-images --git-ref
      main --timeout 1800 --variable IMG_VARIABLES --variable IMG_REGISTRIES --variable
      IMG_SOURCES --variable IMG_DESTINATIONS --variable IMG_SIGNING --variable APPS
      --variable BAZEL_TARGET --variable DDR --variable DDR_WORKFLOW_ID --variable TARGET_ENV
      --variable DYNAMIC_BUILD_RENDER_TARGET_FORWARD_PARAMETERS
    stage: deploy_containers
    tags:
    - arch:amd64
    variables:
      IMG_SIGNING: ''
      IMG_VARIABLES: ''
      SRC_AGENT: registry.ddbuild.io/ci/datadog-agent/agent
      SRC_CWS_INSTRUMENTATION: registry.ddbuild.io/ci/datadog-agent/cws-instrumentation
      SRC_DCA: registry.ddbuild.io/ci/datadog-agent/cluster-agent
      SRC_DSD: registry.ddbuild.io/ci/datadog-agent/dogstatsd
-     VERSION: 7-full-rc
?                -----
+     VERSION: 7-rc

Changes Summary

Removed Modified Added Renamed
0 1 0 0

ℹ️ Diff available in the job log.

@agent-platform-auto-pr
Copy link
Contributor Author

Uncompressed package size comparison

Comparison with ancestor 57743915bc9c36d1d439c78336c47f1676814d98

Size reduction summary
package diff status size ancestor threshold
datadog-iot-agent-x86_64-rpm -0.00MB 60.89MB 60.89MB 0.50MB
datadog-iot-agent-x86_64-suse -0.00MB 60.89MB 60.89MB 0.50MB
datadog-iot-agent-aarch64-rpm -0.00MB 58.19MB 58.19MB 0.50MB
Diff per package
package diff status size ancestor threshold
datadog-agent-x86_64-rpm 0.04MB ⚠️ 805.63MB 805.59MB 0.50MB
datadog-agent-x86_64-suse 0.04MB ⚠️ 805.63MB 805.59MB 0.50MB
datadog-agent-amd64-deb 0.04MB ⚠️ 796.69MB 796.65MB 0.50MB
datadog-heroku-agent-amd64-deb 0.03MB ⚠️ 440.71MB 440.68MB 0.50MB
datadog-agent-aarch64-rpm 0.02MB ⚠️ 795.48MB 795.46MB 0.50MB
datadog-agent-arm64-deb 0.02MB ⚠️ 786.56MB 786.54MB 0.50MB
datadog-dogstatsd-amd64-deb 0.00MB 31.26MB 31.26MB 0.50MB
datadog-dogstatsd-arm64-deb 0.00MB 30.09MB 30.09MB 0.50MB
datadog-dogstatsd-x86_64-rpm 0.00MB 31.34MB 31.34MB 0.50MB
datadog-dogstatsd-x86_64-suse 0.00MB 31.34MB 31.34MB 0.50MB
datadog-iot-agent-amd64-deb 0.00MB 60.82MB 60.82MB 0.50MB
datadog-iot-agent-arm64-deb 0.00MB 58.12MB 58.12MB 0.50MB

Decision

⚠️ Warning

Copy link

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 1ff8f4d8-4cfa-47d6-9718-32da53ebdf09

Baseline: b6c2e2f
Comparison: 5d4b65d
Diff

❌ Experiments with missing or malformed data

This is a critical error. No usable optimization goal data was produced by the listed experiments. This may be a result of misconfiguration. Ping #single-machine-performance and we can help out.

  • ddot_traces (Logs)

Optimization Goals: ❌ Regression(s) detected

perf experiment goal Δ mean % Δ mean % CI trials links
quality_gate_logs % cpu utilization +5.71 [+2.86, +8.56] 1 Logs bounds checks dashboard

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
quality_gate_logs % cpu utilization +5.71 [+2.86, +8.56] 1 Logs bounds checks dashboard
otlp_ingest_traces memory utilization +2.28 [+1.98, +2.58] 1 Logs
otlp_ingest_metrics memory utilization +1.31 [+1.16, +1.46] 1 Logs
ddot_logs memory utilization +1.09 [+1.04, +1.14] 1 Logs
file_tree memory utilization +0.19 [+0.06, +0.33] 1 Logs
file_to_blackhole_0ms_latency_http1 egress throughput +0.07 [-0.79, +0.92] 1 Logs
file_to_blackhole_0ms_latency egress throughput +0.04 [-0.82, +0.91] 1 Logs
file_to_blackhole_0ms_latency_http2 egress throughput +0.02 [-0.88, +0.93] 1 Logs
file_to_blackhole_1000ms_latency_linear_load egress throughput +0.01 [-0.21, +0.23] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput +0.01 [-0.01, +0.03] 1 Logs
file_to_blackhole_1000ms_latency egress throughput -0.00 [-0.82, +0.82] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.00 [-0.30, +0.30] 1 Logs
file_to_blackhole_300ms_latency egress throughput -0.01 [-0.79, +0.78] 1 Logs
file_to_blackhole_500ms_latency egress throughput -0.03 [-0.84, +0.79] 1 Logs
quality_gate_idle_all_features memory utilization -0.05 [-0.20, +0.09] 1 Logs bounds checks dashboard
ddot_metrics memory utilization -0.07 [-0.12, -0.02] 1 Logs
file_to_blackhole_100ms_latency egress throughput -0.07 [-0.97, +0.83] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization -0.58 [-0.64, -0.53] 1 Logs
otlp_ingest_logs memory utilization -0.71 [-0.87, -0.56] 1 Logs
quality_gate_idle memory utilization -0.99 [-1.05, -0.93] 1 Logs bounds checks dashboard
tcp_syslog_to_blackhole ingress throughput -1.16 [-1.23, -1.08] 1 Logs
uds_dogstatsd_to_api_cpu % cpu utilization -2.06 [-2.90, -1.22] 1 Logs

Bounds Checks: ❌ Failed

perf experiment bounds_check_name replicates_passed links
quality_gate_idle_all_features memory_usage 9/10 bounds checks dashboard
file_to_blackhole_0ms_latency lost_bytes 10/10
file_to_blackhole_0ms_latency memory_usage 10/10
file_to_blackhole_0ms_latency_http1 lost_bytes 10/10
file_to_blackhole_0ms_latency_http1 memory_usage 10/10
file_to_blackhole_0ms_latency_http2 lost_bytes 10/10
file_to_blackhole_0ms_latency_http2 memory_usage 10/10
file_to_blackhole_1000ms_latency memory_usage 10/10
file_to_blackhole_1000ms_latency_linear_load memory_usage 10/10
file_to_blackhole_100ms_latency lost_bytes 10/10
file_to_blackhole_100ms_latency memory_usage 10/10
file_to_blackhole_300ms_latency lost_bytes 10/10
file_to_blackhole_300ms_latency memory_usage 10/10
file_to_blackhole_500ms_latency lost_bytes 10/10
file_to_blackhole_500ms_latency memory_usage 10/10
quality_gate_idle intake_connections 10/10 bounds checks dashboard
quality_gate_idle memory_usage 10/10 bounds checks dashboard
quality_gate_idle_all_features intake_connections 10/10 bounds checks dashboard
quality_gate_logs intake_connections 10/10 bounds checks dashboard
quality_gate_logs lost_bytes 10/10 bounds checks dashboard
quality_gate_logs memory_usage 10/10 bounds checks dashboard

Explanation

Confidence level: 90.00%
Effect size tolerance: |Δ mean %| ≥ 5.00%

Performance changes are noted in the perf column of each table:

  • ✅ = significantly better comparison variant performance
  • ❌ = significantly worse comparison variant performance
  • ➖ = no significant change in performance

A regression test is an A/B test of target performance in a repeatable rig, where "performance" is measured as "comparison variant minus baseline variant" for an optimization goal (e.g., ingress throughput). Due to intrinsic variability in measuring that goal, we can only estimate its mean value for each experiment; we report uncertainty in that value as a 90.00% confidence interval denoted "Δ mean % CI".

For each experiment, we decide whether a change in performance is a "regression" -- a change worth investigating further -- if all of the following criteria are true:

  1. Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.

  2. Its 90.00% confidence interval "Δ mean % CI" does not contain zero, indicating that if our statistical model is accurate, there is at least a 90.00% chance there is a difference in performance between baseline and comparison variants.

  3. Its configuration does not mark it "erratic".

CI Pass/Fail Decision

Failed. Some Quality Gates were violated.

  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check memory_usage: 9/10 replicas passed. Failed 1 which is > 0. Gate FAILED.
  • quality_gate_idle_all_features, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.

@agent-platform-auto-pr
Copy link
Contributor Author

Static quality checks

✅ Please find below the results from static quality gates

Successful checks

Info

Result Quality gate On disk size On disk size limit On wire size On wire size limit
static_quality_gate_agent_deb_amd64 770.52 MiB 778.06 MiB 188.73 MiB 191.06 MiB
static_quality_gate_agent_deb_amd64_fips 768.45 MiB 776.09 MiB 187.13 MiB 190.72 MiB
static_quality_gate_agent_heroku_amd64 428.24 MiB 434.99 MiB 112.73 MiB 114.34 MiB
static_quality_gate_agent_msi 958.55 MiB 978.45 MiB 148.11 MiB 151.65 MiB
static_quality_gate_agent_rpm_amd64 770.53 MiB 778.06 MiB 189.45 MiB 193.42 MiB
static_quality_gate_agent_rpm_amd64_fips 768.31 MiB 776.06 MiB 189.09 MiB 192.61 MiB
static_quality_gate_agent_rpm_arm64 760.74 MiB 768.33 MiB 172.17 MiB 174.71 MiB
static_quality_gate_agent_rpm_arm64_fips 758.95 MiB 766.55 MiB 171.11 MiB 173.92 MiB
static_quality_gate_agent_suse_amd64 770.42 MiB 778.08 MiB 189.45 MiB 193.42 MiB
static_quality_gate_agent_suse_amd64_fips 768.36 MiB 776.11 MiB 189.09 MiB 192.78 MiB
static_quality_gate_agent_suse_arm64 760.79 MiB 768.31 MiB 172.17 MiB 174.71 MiB
static_quality_gate_agent_suse_arm64_fips 758.88 MiB 766.5 MiB 171.11 MiB 173.92 MiB
static_quality_gate_docker_agent_amd64 855.09 MiB 862.5 MiB 287.84 MiB 292.0 MiB
static_quality_gate_docker_agent_arm64 868.7 MiB 876.0 MiB 274.43 MiB 278.3 MiB
static_quality_gate_docker_agent_jmx_amd64 855.09 MiB 862.5 MiB 287.84 MiB 292.0 MiB
static_quality_gate_docker_agent_jmx_arm64 868.7 MiB 876.63 MiB 274.43 MiB 278.4 MiB
static_quality_gate_docker_agent_windows1809 855.09 MiB 862.5 MiB 287.84 MiB 292.0 MiB
static_quality_gate_docker_agent_windows1809_core 855.09 MiB 862.5 MiB 287.84 MiB 292.0 MiB
static_quality_gate_docker_agent_windows1809_core_jmx 855.09 MiB 862.5 MiB 287.84 MiB 292.0 MiB
static_quality_gate_docker_agent_windows1809_jmx 855.09 MiB 862.5 MiB 287.84 MiB 292.0 MiB
static_quality_gate_docker_agent_windows2022 855.09 MiB 862.5 MiB 287.84 MiB 292.0 MiB
static_quality_gate_docker_agent_windows2022_core 855.09 MiB 862.5 MiB 287.84 MiB 292.0 MiB
static_quality_gate_docker_agent_windows2022_core_jmx 855.09 MiB 862.5 MiB 287.84 MiB 292.0 MiB
static_quality_gate_docker_agent_windows2022_jmx 855.09 MiB 862.5 MiB 287.84 MiB 292.0 MiB
static_quality_gate_docker_cluster_agent_amd64 262.74 MiB 263.4 MiB 103.32 MiB 104.07 MiB
static_quality_gate_docker_cluster_agent_arm64 278.68 MiB 279.38 MiB 98.18 MiB 98.95 MiB
static_quality_gate_docker_cws_instrumentation_amd64 6.65 MiB 7.12 MiB 2.82 MiB 3.29 MiB
static_quality_gate_docker_cws_instrumentation_arm64 6.44 MiB 6.92 MiB 2.6 MiB 3.07 MiB
static_quality_gate_docker_dogstatsd_amd64 38.03 MiB 46.39 MiB 14.67 MiB 17.78 MiB
static_quality_gate_docker_dogstatsd_arm64 36.94 MiB 45.05 MiB 13.75 MiB 16.65 MiB
static_quality_gate_dogstatsd_deb_amd64 29.89 MiB 38.4 MiB 7.91 MiB 10.26 MiB
static_quality_gate_dogstatsd_deb_arm64 28.77 MiB 36.98 MiB 6.89 MiB 8.96 MiB
static_quality_gate_dogstatsd_rpm_amd64 29.89 MiB 38.4 MiB 7.92 MiB 10.27 MiB
static_quality_gate_dogstatsd_suse_amd64 29.89 MiB 38.4 MiB 7.92 MiB 10.27 MiB
static_quality_gate_iot_agent_deb_amd64 58.08 MiB 58.51 MiB 14.61 MiB 15.02 MiB
static_quality_gate_iot_agent_deb_arm64 55.51 MiB 55.94 MiB 12.62 MiB 13.05 MiB
static_quality_gate_iot_agent_deb_armhf 54.21 MiB 54.32 MiB 12.62 MiB 13.05 MiB
static_quality_gate_iot_agent_rpm_amd64 58.07 MiB 58.51 MiB 14.63 MiB 15.04 MiB
static_quality_gate_iot_agent_rpm_arm64 55.51 MiB 55.94 MiB 12.65 MiB 13.07 MiB
static_quality_gate_iot_agent_suse_amd64 58.07 MiB 58.51 MiB 14.63 MiB 15.04 MiB

@kacper-murzyn
Copy link
Contributor

/merge

@dd-devflow
Copy link

dd-devflow bot commented Apr 25, 2025

View all feedbacks in Devflow UI.

2025-04-25 14:57:54 UTC ℹ️ Start processing command /merge


2025-04-25 14:58:04 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in 7.66.x is approximately 35m (p90).


2025-04-25 15:24:40 UTC ℹ️ MergeQueue: This merge request was merged

@dd-mergequeue dd-mergequeue bot merged commit e07decc into 7.66.x Apr 25, 2025
321 of 323 checks passed
@dd-mergequeue dd-mergequeue bot deleted the backport-36432-to-7.66.x branch April 25, 2025 15:24
@github-actions github-actions bot added this to the 7.66.0 milestone Apr 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport bot changelog/no-changelog qa/rc-required Only for a PR that requires validation on the Release Candidate short review PR is simple enough to be reviewed quickly team/agent-delivery
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants