[CI] Fix Python virtualenv usage in the Gitlab macOS runners #30612

amenasria · 2024-10-30T14:59:09Z

What does this PR do?

Changes the way we deal with Python cache depending: there's now one virtual env per Python version. The jobs now use datadog-agent-python-$PYTHON_VERSION as the virtualenv.
Refactors a bit the warning echo-ed in the CI about the Go and Python versions already installed on the runners

Motivation

There's no need to remove the virtualenv directly for every job. It slows the job down.
Readability

Describe how to test/QA your changes

Possible Drawbacks / Trade-offs

Additional Notes

…Gitlab runners (#30329)" (#30579)" This reverts commit 165d820.

agent-platform-auto-pr · 2024-10-31T10:48:11Z

Gitlab CI Configuration Changes

Modified Jobs

.lint_macos_gitlab

  .lint_macos_gitlab:
    before_script:
    - 'eval $(gimme $(cat .go-version))
  
      export GOPATH=$GOROOT
  
+     '
+   - "PYTHON_REPO_VERSION=$(cat .python-version)\nPYTHON_VERSION=$(python3 --version\
+     \ | awk '{print $2}' | sed 's/\\.[0-9]*$//')\nVENV_NAME=\"datadog-agent-python-$PYTHON_VERSION\"\
+     \nif [ \"$PYTHON_REPO_VERSION\" != \"$PYTHON_VERSION\" ]; then\n  echo \"Warning:\
+     \ The current Python version $PYTHON_VERSION is different from $PYTHON_REPO_VERSION\
+     \ in .python-version.\"\n  echo \"Installing Python $PYTHON_REPO_VERSION...\"\n\
+     fi\nif ! pyenv virtualenvs --bare | grep -q \"^${VENV_NAME}$\"; then\n  pyenv\
+     \ virtualenv $PYTHON_VERSION $VENV_NAME\nfi\npyenv activate $VENV_NAME\n"
-     echo "Don''t forget to regularly delete unused versions. Here are the installed
?    ^
+   - 'echo "Don''t forget to regularly delete Go unused versions. Here are the installed
?   + ^                                        +++
-     versions and their memory usage on the runner:"
?                        ^^^^^^ -  ^
+     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>"
+ 
      '
-   - "PYTHON_REPO_VERSION=$(cat .python-version)\nPYTHON_VERSION=$(python3 --version\
-     \ | awk '{print $2}' | sed 's/\\.[0-9]*$//')\nif [ \"$PYTHON_REPO_VERSION\" !=\
-     \ \"$PYTHON_VERSION\" ]; then\n  echo \"Python version $PYTHON_VERSION is different\
-     \ from $PYTHON_REPO_VERSION in .python-version. Cleaning the environment.\"\n\
-     \  pyenv uninstall -f datadog-agent\n  echo \"Installing Python $PYTHON_REPO_VERSION...\"\
-     \n  pyenv virtualenv 3.11.8 datadog-agent\n  pyenv activate datadog-agent\nelse\n\
-     \  echo \"Python current version $PYTHON_VERSION is the same as .python-version.\
-     \ Keeping the existing environment.\"\nfi\n"
+   - '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 -r requirements.txt -r tasks/libs/requirements-github.txt
    - pyenv rehash
    - inv -e rtloader.make
    - inv -e rtloader.install
    - 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
    - rm -f modcache.tar.xz
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache_tools.tar.xz -C $GOPATH/pkg/mod/cache
    - rm -f modcache_tools.tar.xz
    - inv -e linter.go --cpus 12 --debug --timeout 60
    stage: lint

.macos_gitlab

  .macos_gitlab:
    before_script:
    - 'eval $(gimme $(cat .go-version))
  
      export GOPATH=$GOROOT
  
+     '
+   - "PYTHON_REPO_VERSION=$(cat .python-version)\nPYTHON_VERSION=$(python3 --version\
+     \ | awk '{print $2}' | sed 's/\\.[0-9]*$//')\nVENV_NAME=\"datadog-agent-python-$PYTHON_VERSION\"\
+     \nif [ \"$PYTHON_REPO_VERSION\" != \"$PYTHON_VERSION\" ]; then\n  echo \"Warning:\
+     \ The current Python version $PYTHON_VERSION is different from $PYTHON_REPO_VERSION\
+     \ in .python-version.\"\n  echo \"Installing Python $PYTHON_REPO_VERSION...\"\n\
+     fi\nif ! pyenv virtualenvs --bare | grep -q \"^${VENV_NAME}$\"; then\n  pyenv\
+     \ virtualenv $PYTHON_VERSION $VENV_NAME\nfi\npyenv activate $VENV_NAME\n"
-     echo "Don''t forget to regularly delete unused versions. Here are the installed
?    ^
+   - 'echo "Don''t forget to regularly delete Go unused versions. Here are the installed
?   + ^                                        +++
-     versions and their memory usage on the runner:"
?                        ^^^^^^ -  ^
+     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>"
+ 
      '
-   - "PYTHON_REPO_VERSION=$(cat .python-version)\nPYTHON_VERSION=$(python3 --version\
-     \ | awk '{print $2}' | sed 's/\\.[0-9]*$//')\nif [ \"$PYTHON_REPO_VERSION\" !=\
-     \ \"$PYTHON_VERSION\" ]; then\n  echo \"Python version $PYTHON_VERSION is different\
-     \ from $PYTHON_REPO_VERSION in .python-version. Cleaning the environment.\"\n\
-     \  pyenv uninstall -f datadog-agent\n  echo \"Installing Python $PYTHON_REPO_VERSION...\"\
-     \n  pyenv virtualenv 3.11.8 datadog-agent\n  pyenv activate datadog-agent\nelse\n\
-     \  echo \"Python current version $PYTHON_VERSION is the same as .python-version.\
-     \ Keeping the existing environment.\"\nfi\n"
+   - '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 -r requirements.txt -r tasks/libs/requirements-github.txt
    - pyenv rehash
    - inv -e rtloader.make
    - inv -e rtloader.install
    - inv -e install-tools

.tests_macos_gitlab

  .tests_macos_gitlab:
    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:
    - 'eval $(gimme $(cat .go-version))
  
      export GOPATH=$GOROOT
  
+     '
+   - "PYTHON_REPO_VERSION=$(cat .python-version)\nPYTHON_VERSION=$(python3 --version\
+     \ | awk '{print $2}' | sed 's/\\.[0-9]*$//')\nVENV_NAME=\"datadog-agent-python-$PYTHON_VERSION\"\
+     \nif [ \"$PYTHON_REPO_VERSION\" != \"$PYTHON_VERSION\" ]; then\n  echo \"Warning:\
+     \ The current Python version $PYTHON_VERSION is different from $PYTHON_REPO_VERSION\
+     \ in .python-version.\"\n  echo \"Installing Python $PYTHON_REPO_VERSION...\"\n\
+     fi\nif ! pyenv virtualenvs --bare | grep -q \"^${VENV_NAME}$\"; then\n  pyenv\
+     \ virtualenv $PYTHON_VERSION $VENV_NAME\nfi\npyenv activate $VENV_NAME\n"
-     echo "Don''t forget to regularly delete unused versions. Here are the installed
?    ^
+   - 'echo "Don''t forget to regularly delete Go unused versions. Here are the installed
?   + ^                                        +++
-     versions and their memory usage on the runner:"
?                        ^^^^^^ -  ^
+     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>"
+ 
      '
-   - "PYTHON_REPO_VERSION=$(cat .python-version)\nPYTHON_VERSION=$(python3 --version\
-     \ | awk '{print $2}' | sed 's/\\.[0-9]*$//')\nif [ \"$PYTHON_REPO_VERSION\" !=\
-     \ \"$PYTHON_VERSION\" ]; then\n  echo \"Python version $PYTHON_VERSION is different\
-     \ from $PYTHON_REPO_VERSION in .python-version. Cleaning the environment.\"\n\
-     \  pyenv uninstall -f datadog-agent\n  echo \"Installing Python $PYTHON_REPO_VERSION...\"\
-     \n  pyenv virtualenv 3.11.8 datadog-agent\n  pyenv activate datadog-agent\nelse\n\
-     \  echo \"Python current version $PYTHON_VERSION is the same as .python-version.\
-     \ Keeping the existing environment.\"\nfi\n"
+   - '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 -r requirements.txt -r tasks/libs/requirements-github.txt
    - pyenv rehash
    - inv -e rtloader.make
    - inv -e rtloader.install
    - 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
    - rm -f modcache.tar.xz
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache_tools.tar.xz -C $GOPATH/pkg/mod/cache
    - rm -f modcache_tools.tar.xz
    - 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
    - inv -e test --rerun-fails=2 --race --profile --cpus 12 --save-result-json $TEST_OUTPUT_FILE
      --junit-tar "junit-${CI_JOB_NAME}.tgz" $FAST_TESTS_FLAG --test-washer
    - inv -e invoke-unit-tests
    stage: source_test
    variables:
      TEST_OUTPUT_FILE: test_output.json

lint_macos_gitlab_amd64

  lint_macos_gitlab_amd64:
    before_script:
    - 'eval $(gimme $(cat .go-version))
  
      export GOPATH=$GOROOT
  
+     '
+   - "PYTHON_REPO_VERSION=$(cat .python-version)\nPYTHON_VERSION=$(python3 --version\
+     \ | awk '{print $2}' | sed 's/\\.[0-9]*$//')\nVENV_NAME=\"datadog-agent-python-$PYTHON_VERSION\"\
+     \nif [ \"$PYTHON_REPO_VERSION\" != \"$PYTHON_VERSION\" ]; then\n  echo \"Warning:\
+     \ The current Python version $PYTHON_VERSION is different from $PYTHON_REPO_VERSION\
+     \ in .python-version.\"\n  echo \"Installing Python $PYTHON_REPO_VERSION...\"\n\
+     fi\nif ! pyenv virtualenvs --bare | grep -q \"^${VENV_NAME}$\"; then\n  pyenv\
+     \ virtualenv $PYTHON_VERSION $VENV_NAME\nfi\npyenv activate $VENV_NAME\n"
-     echo "Don''t forget to regularly delete unused versions. Here are the installed
?    ^
+   - 'echo "Don''t forget to regularly delete Go unused versions. Here are the installed
?   + ^                                        +++
-     versions and their memory usage on the runner:"
?                        ^^^^^^ -  ^
+     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>"
+ 
      '
-   - "PYTHON_REPO_VERSION=$(cat .python-version)\nPYTHON_VERSION=$(python3 --version\
-     \ | awk '{print $2}' | sed 's/\\.[0-9]*$//')\nif [ \"$PYTHON_REPO_VERSION\" !=\
-     \ \"$PYTHON_VERSION\" ]; then\n  echo \"Python version $PYTHON_VERSION is different\
-     \ from $PYTHON_REPO_VERSION in .python-version. Cleaning the environment.\"\n\
-     \  pyenv uninstall -f datadog-agent\n  echo \"Installing Python $PYTHON_REPO_VERSION...\"\
-     \n  pyenv virtualenv 3.11.8 datadog-agent\n  pyenv activate datadog-agent\nelse\n\
-     \  echo \"Python current version $PYTHON_VERSION is the same as .python-version.\
-     \ Keeping the existing environment.\"\nfi\n"
+   - '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 -r requirements.txt -r tasks/libs/requirements-github.txt
    - pyenv rehash
    - inv -e rtloader.make
    - inv -e rtloader.install
    - 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
    - rm -f modcache.tar.xz
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache_tools.tar.xz -C $GOPATH/pkg/mod/cache
    - rm -f modcache_tools.tar.xz
    - inv -e linter.go --cpus 12 --debug --timeout 60
    stage: lint
    tags:
    - macos:monterey-amd64
    - specific:true

lint_macos_gitlab_arm64

  lint_macos_gitlab_arm64:
    allow_failure: true
    before_script:
    - 'eval $(gimme $(cat .go-version))
  
      export GOPATH=$GOROOT
  
+     '
+   - "PYTHON_REPO_VERSION=$(cat .python-version)\nPYTHON_VERSION=$(python3 --version\
+     \ | awk '{print $2}' | sed 's/\\.[0-9]*$//')\nVENV_NAME=\"datadog-agent-python-$PYTHON_VERSION\"\
+     \nif [ \"$PYTHON_REPO_VERSION\" != \"$PYTHON_VERSION\" ]; then\n  echo \"Warning:\
+     \ The current Python version $PYTHON_VERSION is different from $PYTHON_REPO_VERSION\
+     \ in .python-version.\"\n  echo \"Installing Python $PYTHON_REPO_VERSION...\"\n\
+     fi\nif ! pyenv virtualenvs --bare | grep -q \"^${VENV_NAME}$\"; then\n  pyenv\
+     \ virtualenv $PYTHON_VERSION $VENV_NAME\nfi\npyenv activate $VENV_NAME\n"
-     echo "Don''t forget to regularly delete unused versions. Here are the installed
?    ^
+   - 'echo "Don''t forget to regularly delete Go unused versions. Here are the installed
?   + ^                                        +++
-     versions and their memory usage on the runner:"
?                        ^^^^^^ -  ^
+     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>"
+ 
      '
-   - "PYTHON_REPO_VERSION=$(cat .python-version)\nPYTHON_VERSION=$(python3 --version\
-     \ | awk '{print $2}' | sed 's/\\.[0-9]*$//')\nif [ \"$PYTHON_REPO_VERSION\" !=\
-     \ \"$PYTHON_VERSION\" ]; then\n  echo \"Python version $PYTHON_VERSION is different\
-     \ from $PYTHON_REPO_VERSION in .python-version. Cleaning the environment.\"\n\
-     \  pyenv uninstall -f datadog-agent\n  echo \"Installing Python $PYTHON_REPO_VERSION...\"\
-     \n  pyenv virtualenv 3.11.8 datadog-agent\n  pyenv activate datadog-agent\nelse\n\
-     \  echo \"Python current version $PYTHON_VERSION is the same as .python-version.\
-     \ Keeping the existing environment.\"\nfi\n"
+   - '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 -r requirements.txt -r tasks/libs/requirements-github.txt
    - pyenv rehash
    - inv -e rtloader.make
    - inv -e rtloader.install
    - 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
    - rm -f modcache.tar.xz
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache_tools.tar.xz -C $GOPATH/pkg/mod/cache
    - rm -f modcache_tools.tar.xz
    - inv -e linter.go --cpus 12 --debug --timeout 60
    stage: lint
    tags:
    - macos:monterey-arm64
    - specific:true

tests_macos_gitlab_amd64

  tests_macos_gitlab_amd64:
    after_script:
    - $CI_PROJECT_DIR/tools/ci/junit_upload.sh
    - CODECOV_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $CODECOV_TOKEN) || exit
      $?; export CODECOV_TOKEN
    - 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:
    - 'eval $(gimme $(cat .go-version))
  
      export GOPATH=$GOROOT
  
+     '
+   - "PYTHON_REPO_VERSION=$(cat .python-version)\nPYTHON_VERSION=$(python3 --version\
+     \ | awk '{print $2}' | sed 's/\\.[0-9]*$//')\nVENV_NAME=\"datadog-agent-python-$PYTHON_VERSION\"\
+     \nif [ \"$PYTHON_REPO_VERSION\" != \"$PYTHON_VERSION\" ]; then\n  echo \"Warning:\
+     \ The current Python version $PYTHON_VERSION is different from $PYTHON_REPO_VERSION\
+     \ in .python-version.\"\n  echo \"Installing Python $PYTHON_REPO_VERSION...\"\n\
+     fi\nif ! pyenv virtualenvs --bare | grep -q \"^${VENV_NAME}$\"; then\n  pyenv\
+     \ virtualenv $PYTHON_VERSION $VENV_NAME\nfi\npyenv activate $VENV_NAME\n"
-     echo "Don''t forget to regularly delete unused versions. Here are the installed
?    ^
+   - 'echo "Don''t forget to regularly delete Go unused versions. Here are the installed
?   + ^                                        +++
-     versions and their memory usage on the runner:"
?                        ^^^^^^ -  ^
+     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>"
+ 
      '
-   - "PYTHON_REPO_VERSION=$(cat .python-version)\nPYTHON_VERSION=$(python3 --version\
-     \ | awk '{print $2}' | sed 's/\\.[0-9]*$//')\nif [ \"$PYTHON_REPO_VERSION\" !=\
-     \ \"$PYTHON_VERSION\" ]; then\n  echo \"Python version $PYTHON_VERSION is different\
-     \ from $PYTHON_REPO_VERSION in .python-version. Cleaning the environment.\"\n\
-     \  pyenv uninstall -f datadog-agent\n  echo \"Installing Python $PYTHON_REPO_VERSION...\"\
-     \n  pyenv virtualenv 3.11.8 datadog-agent\n  pyenv activate datadog-agent\nelse\n\
-     \  echo \"Python current version $PYTHON_VERSION is the same as .python-version.\
-     \ Keeping the existing environment.\"\nfi\n"
+   - '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 -r requirements.txt -r tasks/libs/requirements-github.txt
    - pyenv rehash
    - inv -e rtloader.make
    - inv -e rtloader.install
    - 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
    - rm -f modcache.tar.xz
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache_tools.tar.xz -C $GOPATH/pkg/mod/cache
    - rm -f modcache_tools.tar.xz
    - 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
    - inv -e test --rerun-fails=2 --race --profile --cpus 12 --save-result-json $TEST_OUTPUT_FILE
      --junit-tar "junit-${CI_JOB_NAME}.tgz" $FAST_TESTS_FLAG --test-washer
    - inv -e invoke-unit-tests
    stage: source_test
    tags:
    - macos:monterey-amd64
    - specific:true
    variables:
      TEST_OUTPUT_FILE: test_output.json

tests_macos_gitlab_arm64

  tests_macos_gitlab_arm64:
    after_script:
    - $CI_PROJECT_DIR/tools/ci/junit_upload.sh
    - CODECOV_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $CODECOV_TOKEN) || exit
      $?; export CODECOV_TOKEN
    - 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:
    - 'eval $(gimme $(cat .go-version))
  
      export GOPATH=$GOROOT
  
+     '
+   - "PYTHON_REPO_VERSION=$(cat .python-version)\nPYTHON_VERSION=$(python3 --version\
+     \ | awk '{print $2}' | sed 's/\\.[0-9]*$//')\nVENV_NAME=\"datadog-agent-python-$PYTHON_VERSION\"\
+     \nif [ \"$PYTHON_REPO_VERSION\" != \"$PYTHON_VERSION\" ]; then\n  echo \"Warning:\
+     \ The current Python version $PYTHON_VERSION is different from $PYTHON_REPO_VERSION\
+     \ in .python-version.\"\n  echo \"Installing Python $PYTHON_REPO_VERSION...\"\n\
+     fi\nif ! pyenv virtualenvs --bare | grep -q \"^${VENV_NAME}$\"; then\n  pyenv\
+     \ virtualenv $PYTHON_VERSION $VENV_NAME\nfi\npyenv activate $VENV_NAME\n"
-     echo "Don''t forget to regularly delete unused versions. Here are the installed
?    ^
+   - 'echo "Don''t forget to regularly delete Go unused versions. Here are the installed
?   + ^                                        +++
-     versions and their memory usage on the runner:"
?                        ^^^^^^ -  ^
+     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>"
+ 
      '
-   - "PYTHON_REPO_VERSION=$(cat .python-version)\nPYTHON_VERSION=$(python3 --version\
-     \ | awk '{print $2}' | sed 's/\\.[0-9]*$//')\nif [ \"$PYTHON_REPO_VERSION\" !=\
-     \ \"$PYTHON_VERSION\" ]; then\n  echo \"Python version $PYTHON_VERSION is different\
-     \ from $PYTHON_REPO_VERSION in .python-version. Cleaning the environment.\"\n\
-     \  pyenv uninstall -f datadog-agent\n  echo \"Installing Python $PYTHON_REPO_VERSION...\"\
-     \n  pyenv virtualenv 3.11.8 datadog-agent\n  pyenv activate datadog-agent\nelse\n\
-     \  echo \"Python current version $PYTHON_VERSION is the same as .python-version.\
-     \ Keeping the existing environment.\"\nfi\n"
+   - '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 -r requirements.txt -r tasks/libs/requirements-github.txt
    - pyenv rehash
    - inv -e rtloader.make
    - inv -e rtloader.install
    - 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
    - rm -f modcache.tar.xz
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache_tools.tar.xz -C $GOPATH/pkg/mod/cache
    - rm -f modcache_tools.tar.xz
    - 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
    - inv -e test --rerun-fails=2 --race --profile --cpus 12 --save-result-json $TEST_OUTPUT_FILE
      --junit-tar "junit-${CI_JOB_NAME}.tgz" $FAST_TESTS_FLAG --test-washer
    - inv -e invoke-unit-tests
    stage: source_test
    tags:
    - macos:monterey-arm64
    - specific:true
    variables:
      TEST_OUTPUT_FILE: test_output.json

Added Jobs

.list_go_versions_commands

.list_go_versions_commands:
- '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>"

  '

.list_python_versions_commands

.list_python_versions_commands:
- '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>"

  '

.select_python_env_commands

.select_python_env_commands:
- "PYTHON_REPO_VERSION=$(cat .python-version)\nPYTHON_VERSION=$(python3 --version\
  \ | awk '{print $2}' | sed 's/\\.[0-9]*$//')\nVENV_NAME=\"datadog-agent-python-$PYTHON_VERSION\"\
  \nif [ \"$PYTHON_REPO_VERSION\" != \"$PYTHON_VERSION\" ]; then\n  echo \"Warning:\
  \ The current Python version $PYTHON_VERSION is different from $PYTHON_REPO_VERSION\
  \ in .python-version.\"\n  echo \"Installing Python $PYTHON_REPO_VERSION...\"\n\
  fi\nif ! pyenv virtualenvs --bare | grep -q \"^${VENV_NAME}$\"; then\n  pyenv virtualenv\
  \ $PYTHON_VERSION $VENV_NAME\nfi\npyenv activate $VENV_NAME\n"

Changes Summary

Removed	Modified	Added	Renamed
0	7	3	0

ℹ️ Diff available in the job log.

agent-platform-auto-pr · 2024-10-31T11:08:36Z

[Fast Unit Tests Report]

On pipeline 47967460 (CI Visibility). The following jobs did not run any unit tests:

Jobs:

tests_deb-arm64-py3
tests_deb-x64-py3
tests_flavor_dogstatsd_deb-x64
tests_flavor_heroku_deb-x64
tests_flavor_iot_deb-x64
tests_rpm-arm64-py3
tests_rpm-x64-py3
tests_windows-x64

If you modified Go files and expected unit tests to run in these jobs, please double check the job logs. If you think tests should have been executed reach out to #agent-devx-help

cit-pr-commenter · 2024-10-31T12:27:32Z

Regression Detector

Regression Detector Results

Run ID: e3f4f341-cd15-4a00-b6d8-1941f06c747c Metrics dashboard Target profiles

Baseline: 0a57140
Comparison: 2b8b510

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

No significant changes in experiment optimization goals

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

There were no significant changes in experiment optimization goals at this confidence level and effect size tolerance.

Fine details of change detection per experiment

perf	experiment	goal	Δ mean %	Δ mean % CI	trials	links
➖	pycheck_lots_of_tags	% cpu utilization	+1.16	[-1.40, +3.71]	1	Logs
➖	tcp_syslog_to_blackhole	ingress throughput	+0.31	[+0.26, +0.37]	1	Logs
➖	file_tree	memory utilization	+0.17	[+0.02, +0.31]	1	Logs
➖	file_to_blackhole_0ms_latency	egress throughput	+0.04	[-0.29, +0.37]	1	Logs
➖	uds_dogstatsd_to_api	ingress throughput	+0.02	[-0.10, +0.14]	1	Logs
➖	tcp_dd_logs_filter_exclude	ingress throughput	-0.00	[-0.01, +0.01]	1	Logs
➖	idle	memory utilization	-0.00	[-0.06, +0.05]	1	Logs bounds checks dashboard
➖	file_to_blackhole_500ms_latency	egress throughput	-0.01	[-0.25, +0.24]	1	Logs
➖	file_to_blackhole_100ms_latency	egress throughput	-0.01	[-0.23, +0.22]	1	Logs
➖	file_to_blackhole_300ms_latency	egress throughput	-0.02	[-0.21, +0.16]	1	Logs
➖	file_to_blackhole_1000ms_latency	egress throughput	-0.07	[-0.56, +0.42]	1	Logs
➖	otel_to_otel_logs	ingress throughput	-0.28	[-1.09, +0.53]	1	Logs
➖	quality_gate_idle	memory utilization	-0.96	[-1.01, -0.91]	1	Logs bounds checks dashboard
➖	basic_py_check	% cpu utilization	-0.99	[-3.84, +1.87]	1	Logs
➖	uds_dogstatsd_to_api_cpu	% cpu utilization	-1.71	[-2.44, -0.97]	1	Logs
➖	quality_gate_idle_all_features	memory utilization	-2.01	[-2.14, -1.88]	1	Logs bounds checks dashboard
➖	idle_all_features	memory utilization	-2.38	[-2.50, -2.26]	1	Logs bounds checks dashboard

Bounds Checks

perf	experiment	bounds_check_name	replicates_passed
✅	file_to_blackhole_0ms_latency	memory_usage	10/10
✅	file_to_blackhole_1000ms_latency	memory_usage	10/10
✅	file_to_blackhole_100ms_latency	memory_usage	10/10
✅	file_to_blackhole_300ms_latency	memory_usage	10/10
✅	file_to_blackhole_500ms_latency	memory_usage	10/10
✅	idle	memory_usage	10/10
✅	idle_all_features	memory_usage	10/10
✅	quality_gate_idle	memory_usage	10/10
✅	quality_gate_idle_all_features	memory_usage	10/10

Explanation

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:

Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.
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.
Its configuration does not mark it "erratic".

This reverts commit 48b1d5b.

CelianR

What a proper gitlab syntax 👀

amenasria · 2024-11-04T14:41:23Z

/merge

dd-devflow · 2024-11-04T14:41:32Z

🚂 MergeQueue: pull request added to the queue

The median merge time in main is 22m.

Use /merge -c to cancel this operation!

amenasria added 2 commits October 30, 2024 15:51

Revert "Revert "[CI] Select the right Python virtualenv on the macOS …

51514c5

…Gitlab runners (#30329)" (#30579)" This reverts commit 165d820.

Use Gitlab references instead of yaml references

2885e88

amenasria added changelog/no-changelog qa/no-code-change No code change in Agent code requiring validation team/agent-devx-infra labels Oct 30, 2024

github-actions bot added the short review PR is simple enough to be reviewed quickly label Oct 30, 2024

Trigger pipeline

67fba0a

amenasria added 2 commits October 31, 2024 13:56

Test

48b1d5b

Revert "Test"

2b8b510

This reverts commit 48b1d5b.

amenasria marked this pull request as ready for review October 31, 2024 15:09

amenasria requested a review from a team as a code owner October 31, 2024 15:09

CelianR approved these changes Oct 31, 2024

View reviewed changes

dd-mergequeue bot merged commit 2ad2d6c into main Nov 4, 2024
214 checks passed

dd-mergequeue bot deleted the amenasria/fix-macos-pyenv branch November 4, 2024 15:01

github-actions bot added this to the 7.61.0 milestone Nov 4, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CI] Fix Python virtualenv usage in the Gitlab macOS runners #30612

[CI] Fix Python virtualenv usage in the Gitlab macOS runners #30612

amenasria commented Oct 30, 2024

agent-platform-auto-pr bot commented Oct 31, 2024 •

edited

Loading

Modified Jobs

agent-platform-auto-pr bot commented Oct 31, 2024 •

edited

Loading

cit-pr-commenter bot commented Oct 31, 2024 •

edited

Loading

Fine details of change detection per experiment

Explanation

CelianR left a comment

amenasria commented Nov 4, 2024

dd-devflow bot commented Nov 4, 2024

[CI] Fix Python virtualenv usage in the Gitlab macOS runners #30612

[CI] Fix Python virtualenv usage in the Gitlab macOS runners #30612

Conversation

amenasria commented Oct 30, 2024

What does this PR do?

Motivation

Describe how to test/QA your changes

Possible Drawbacks / Trade-offs

Additional Notes

agent-platform-auto-pr bot commented Oct 31, 2024 • edited Loading

Gitlab CI Configuration Changes

Modified Jobs

Added Jobs

Changes Summary

agent-platform-auto-pr bot commented Oct 31, 2024 • edited Loading

cit-pr-commenter bot commented Oct 31, 2024 • edited Loading

Regression Detector

Regression Detector Results

No significant changes in experiment optimization goals

Fine details of change detection per experiment

Bounds Checks

Explanation

CelianR left a comment

Choose a reason for hiding this comment

amenasria commented Nov 4, 2024

dd-devflow bot commented Nov 4, 2024

agent-platform-auto-pr bot commented Oct 31, 2024 •

edited

Loading

agent-platform-auto-pr bot commented Oct 31, 2024 •

edited

Loading

cit-pr-commenter bot commented Oct 31, 2024 •

edited

Loading