From 74be3189d991703da4b9a55489303668b0561ecb Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Tue, 14 Jun 2022 20:32:41 +0000 Subject: [PATCH] Skip Ansible 2.9 coverage reporting with new AZP container. (#4841) (#4842) ci_coverage (cherry picked from commit 48fbd69835e37376bc8fe2037e18fa021c9f6ee1) Co-authored-by: Felix Fontein --- .azure-pipelines/scripts/aggregate-coverage.sh | 4 ++++ .azure-pipelines/scripts/report-coverage.sh | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.azure-pipelines/scripts/aggregate-coverage.sh b/.azure-pipelines/scripts/aggregate-coverage.sh index 1ccfcf2073..51fae879d8 100755 --- a/.azure-pipelines/scripts/aggregate-coverage.sh +++ b/.azure-pipelines/scripts/aggregate-coverage.sh @@ -9,6 +9,10 @@ PATH="${PWD}/bin:${PATH}" mkdir "${agent_temp_directory}/coverage/" +if [[ "$(ansible --version)" =~ \ 2\.9\. ]]; then + exit +fi + options=(--venv --venv-system-site-packages --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 c039f7dcbd..08d1b60a12 100755 --- a/.azure-pipelines/scripts/report-coverage.sh +++ b/.azure-pipelines/scripts/report-coverage.sh @@ -5,6 +5,10 @@ set -o pipefail -eu PATH="${PWD}/bin:${PATH}" +if [[ "$(ansible --version)" =~ \ 2\.9\. ]]; then + exit +fi + if ! ansible-test --help >/dev/null 2>&1; then # Install the devel version of ansible-test for generating code coverage reports. # This is only used by Ansible Collections, which are typically tested against multiple Ansible versions (in separate jobs).