From d6bc96aee15d256445b83f06b16ae31a02fc5598 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Thu, 26 Jan 2023 10:50:44 -0800 Subject: [PATCH] change coverage upload condition --- .azure-pipelines/templates/jobs/standard-tests-jobs.yml | 5 ----- .azure-pipelines/templates/steps/tox-steps.yml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.azure-pipelines/templates/jobs/standard-tests-jobs.yml b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml index 5d0044d19..1e6d7a352 100644 --- a/.azure-pipelines/templates/jobs/standard-tests-jobs.yml +++ b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml @@ -11,7 +11,6 @@ jobs: macos-cover: IMAGE_NAME: macOS-12 TOXENV: cover - UPLOAD_COVERAGE: 1 windows-py37: IMAGE_NAME: windows-2019 PYTHON_VERSION: 3.7 @@ -20,12 +19,10 @@ jobs: IMAGE_NAME: windows-2019 PYTHON_VERSION: 3.9 TOXENV: cover-win - UPLOAD_COVERAGE: 1 windows-integration-certbot: IMAGE_NAME: windows-2019 PYTHON_VERSION: 3.9 TOXENV: integration-certbot - UPLOAD_COVERAGE: 1 linux-oldest-tests-1: IMAGE_NAME: ubuntu-22.04 PYTHON_VERSION: 3.7 @@ -41,7 +38,6 @@ jobs: linux-cover: IMAGE_NAME: ubuntu-22.04 TOXENV: cover - UPLOAD_COVERAGE: 1 linux-lint: IMAGE_NAME: ubuntu-22.04 TOXENV: lint-posix @@ -53,7 +49,6 @@ jobs: PYTHON_VERSION: 3.8 TOXENV: integration ACME_SERVER: pebble - UPLOAD_COVERAGE: 1 apache-compat: IMAGE_NAME: ubuntu-22.04 TOXENV: apache_compat diff --git a/.azure-pipelines/templates/steps/tox-steps.yml b/.azure-pipelines/templates/steps/tox-steps.yml index a85e1519a..6c7ce2a42 100644 --- a/.azure-pipelines/templates/steps/tox-steps.yml +++ b/.azure-pipelines/templates/steps/tox-steps.yml @@ -78,5 +78,5 @@ steps: chmod +x codecov coverage xml ./codecov || echo "Uploading coverage data failed" - condition: ne(variables['UPLOAD_COVERAGE'], '') + condition: and(eq(variables['uploadCoverage'], true), in(variables['TOXENV', 'cover', 'integration', 'integration-certbot')) displayName: Upload coverage data