From 44ec5075cd25a4d73665fee8e441fdb2e60ca2fc Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Tue, 18 Aug 2020 15:39:46 -0700 Subject: [PATCH] macOS only --- .../templates/jobs/extended-tests-jobs.yml | 71 ------------------- .../templates/jobs/standard-tests-jobs.yml | 57 --------------- .../stages/test-and-package-stage.yml | 1 - 3 files changed, 129 deletions(-) diff --git a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml index 0e1a98861..1af921fd4 100644 --- a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml +++ b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml @@ -6,83 +6,12 @@ jobs: - group: certbot-common strategy: matrix: - linux-py36: - PYTHON_VERSION: 3.6 - TOXENV: py36 - linux-py37: - PYTHON_VERSION: 3.7 - TOXENV: py37 - linux-py37-nopin: - PYTHON_VERSION: 3.7 - TOXENV: py37 - CERTBOT_NO_PIN: 1 - linux-boulder-v1-integration-certbot-oldest: - TOXENV: integration-certbot-oldest - ACME_SERVER: boulder-v1 - linux-boulder-v2-integration-certbot-oldest: - TOXENV: integration-certbot-oldest - ACME_SERVER: boulder-v2 - linux-boulder-v1-integration-nginx-oldest: - TOXENV: integration-nginx-oldest - ACME_SERVER: boulder-v1 - linux-boulder-v2-integration-nginx-oldest: - TOXENV: integration-nginx-oldest - ACME_SERVER: boulder-v2 - linux-boulder-v1-py27-integration: - PYTHON_VERSION: 2.7 - TOXENV: integration - ACME_SERVER: boulder-v1 - linux-boulder-v2-py27-integration: - PYTHON_VERSION: 2.7 - TOXENV: integration - ACME_SERVER: boulder-v2 - linux-boulder-v1-py36-integration: - PYTHON_VERSION: 3.6 - TOXENV: integration - ACME_SERVER: boulder-v1 - linux-boulder-v2-py36-integration: - PYTHON_VERSION: 3.6 - TOXENV: integration - ACME_SERVER: boulder-v2 - linux-boulder-v1-py37-integration: - PYTHON_VERSION: 3.7 - TOXENV: integration - ACME_SERVER: boulder-v1 - linux-boulder-v2-py37-integration: - PYTHON_VERSION: 3.7 - TOXENV: integration - ACME_SERVER: boulder-v2 - linux-boulder-v1-py38-integration: - PYTHON_VERSION: 3.8 - TOXENV: integration - ACME_SERVER: boulder-v1 - linux-boulder-v2-py38-integration: - PYTHON_VERSION: 3.8 - TOXENV: integration - ACME_SERVER: boulder-v2 - nginx-compat: - TOXENV: nginx_compat - le-auto-centos6: - TOXENV: le_auto_centos6 - le-auto-oraclelinux6: - TOXENV: le_auto_oraclelinux6 - docker-dev: - TOXENV: docker_dev macos-farmtest-apache2: # We run one of these test farm tests on macOS to help ensure the # tests continue to work on the platform. IMAGE_NAME: macOS-10.15 PYTHON_VERSION: 3.8 TOXENV: test-farm-apache2 - farmtest-leauto-upgrades: - PYTHON_VERSION: 3.7 - TOXENV: test-farm-leauto-upgrades - farmtest-certonly-standalone: - PYTHON_VERSION: 3.7 - TOXENV: test-farm-certonly-standalone - farmtest-sdists: - PYTHON_VERSION: 3.7 - TOXENV: test-farm-sdists pool: vmImage: $(IMAGE_NAME) steps: diff --git a/.azure-pipelines/templates/jobs/standard-tests-jobs.yml b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml index 3bb73b67e..1086f5fec 100644 --- a/.azure-pipelines/templates/jobs/standard-tests-jobs.yml +++ b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml @@ -10,63 +10,6 @@ jobs: IMAGE_NAME: macOS-10.15 PYTHON_VERSION: 3.8 TOXENV: py38 - windows-py36: - IMAGE_NAME: vs2017-win2016 - PYTHON_VERSION: 3.6 - TOXENV: py36 - windows-py37-cover: - IMAGE_NAME: vs2017-win2016 - PYTHON_VERSION: 3.7 - TOXENV: py37-cover - windows-integration-certbot: - IMAGE_NAME: vs2017-win2016 - PYTHON_VERSION: 3.7 - TOXENV: integration-certbot - linux-oldest-tests-1: - IMAGE_NAME: ubuntu-18.04 - TOXENV: py27-{acme,apache,apache-v2,certbot}-oldest - linux-oldest-tests-2: - IMAGE_NAME: ubuntu-18.04 - TOXENV: py27-{dns,nginx}-oldest - linux-py27: - IMAGE_NAME: ubuntu-18.04 - PYTHON_VERSION: 2.7 - TOXENV: py27 - linux-py36: - IMAGE_NAME: ubuntu-18.04 - PYTHON_VERSION: 3.6 - TOXENV: py36 - linux-py38-cover: - IMAGE_NAME: ubuntu-18.04 - PYTHON_VERSION: 3.8 - TOXENV: py38-cover - linux-py37-lint: - IMAGE_NAME: ubuntu-18.04 - PYTHON_VERSION: 3.7 - TOXENV: lint - linux-py36-mypy: - IMAGE_NAME: ubuntu-18.04 - PYTHON_VERSION: 3.6 - TOXENV: mypy - linux-integration: - IMAGE_NAME: ubuntu-18.04 - PYTHON_VERSION: 2.7 - TOXENV: integration - ACME_SERVER: pebble - apache-compat: - IMAGE_NAME: ubuntu-18.04 - TOXENV: apache_compat - le-auto-xenial: - IMAGE_NAME: ubuntu-18.04 - TOXENV: le_auto_xenial - apacheconftest: - IMAGE_NAME: ubuntu-18.04 - PYTHON_VERSION: 2.7 - TOXENV: apacheconftest-with-pebble - nginxroundtrip: - IMAGE_NAME: ubuntu-18.04 - PYTHON_VERSION: 2.7 - TOXENV: nginxroundtrip pool: vmImage: $(IMAGE_NAME) steps: diff --git a/.azure-pipelines/templates/stages/test-and-package-stage.yml b/.azure-pipelines/templates/stages/test-and-package-stage.yml index 26010644d..81aa168ec 100644 --- a/.azure-pipelines/templates/stages/test-and-package-stage.yml +++ b/.azure-pipelines/templates/stages/test-and-package-stage.yml @@ -3,4 +3,3 @@ stages: jobs: - template: ../jobs/standard-tests-jobs.yml - template: ../jobs/extended-tests-jobs.yml - - template: ../jobs/packaging-jobs.yml