From 177336a9d33a395cf77098a65f59e0fc449ecaad Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Wed, 16 Feb 2022 17:17:25 -0800 Subject: [PATCH] Avoid system-site-packages in AZP coverage venvs. The use of `--venv-system-site-packages` was an optimization to use the `coverage` package pre-installed in the AZP test container. However, now that the venv is bootstrapped by ansible-test that optimization no longer makes sense, since other downloads are already taking place. ci_coverage ci_complete --- .azure-pipelines/scripts/aggregate-coverage.sh | 2 +- .azure-pipelines/scripts/report-coverage.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/scripts/aggregate-coverage.sh b/.azure-pipelines/scripts/aggregate-coverage.sh index 1ccfcf2073d..cb2f0177941 100755 --- a/.azure-pipelines/scripts/aggregate-coverage.sh +++ b/.azure-pipelines/scripts/aggregate-coverage.sh @@ -9,7 +9,7 @@ PATH="${PWD}/bin:${PATH}" mkdir "${agent_temp_directory}/coverage/" -options=(--venv --venv-system-site-packages --color -v) +options=(--venv --color -v) ansible-test coverage combine --group-by command --export "${agent_temp_directory}/coverage/" "${options[@]}" diff --git a/.azure-pipelines/scripts/report-coverage.sh b/.azure-pipelines/scripts/report-coverage.sh index 297169d9f9c..4db905eae28 100755 --- a/.azure-pipelines/scripts/report-coverage.sh +++ b/.azure-pipelines/scripts/report-coverage.sh @@ -14,4 +14,4 @@ fi # Generate stubs using docker (if supported) otherwise fall back to using a virtual environment instead. # The use of docker is required when Powershell code is present, but Ansible 2.12 was the first version to support --docker with coverage. -ansible-test coverage xml --group-by command --stub --docker --color -v || ansible-test coverage xml --group-by command --stub --venv --venv-system-site-packages --color -v +ansible-test coverage xml --group-by command --stub --docker --color -v || ansible-test coverage xml --group-by command --stub --venv --color -v