From 53b7093611bf19c16675f18f5dd651c21fedf3b9 Mon Sep 17 00:00:00 2001
From: Adrien Ferrand <ferrand.ad@gmail.com>
Date: Fri, 26 Jun 2020 22:05:39 +0200
Subject: [PATCH] Simplify config

---
 .azure-pipelines/templates/jobs/extended-tests-jobs.yml | 3 ---
 .azure-pipelines/templates/jobs/packaging-jobs.yml      | 4 +---
 .azure-pipelines/templates/jobs/standard-tests-jobs.yml | 3 ---
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
index fa91cdb22..1d0abbc19 100644
--- a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
+++ b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
@@ -4,9 +4,6 @@ jobs:
       - name: IMAGE_NAME
         value: ubuntu-18.04
       - group: certbot-common
-      - ${{ if contains(variables['TOXENV'], 'integration') }}:
-          name: PYTEST_ADDOPTS
-          value: --numprocesses 4
     strategy:
       matrix:
         linux-py36:
diff --git a/.azure-pipelines/templates/jobs/packaging-jobs.yml b/.azure-pipelines/templates/jobs/packaging-jobs.yml
index d192f1968..77d905da9 100644
--- a/.azure-pipelines/templates/jobs/packaging-jobs.yml
+++ b/.azure-pipelines/templates/jobs/packaging-jobs.yml
@@ -83,8 +83,6 @@ jobs:
     dependsOn: snap_build
     pool:
       vmImage: ubuntu-18.04
-    variables:
-      TOXENV: integration-external,apacheconftest-external-with-pebble
     steps:
       - script: |
           sudo apt-get update
@@ -100,5 +98,5 @@ jobs:
           sudo snap install --dangerous --classic snap/*.snap
         displayName: Install Certbot snap
       - script: |
-          python -m tox
+          python -m tox -e integration-external,apacheconftest-external-with-pebble
         displayName: Run tox
diff --git a/.azure-pipelines/templates/jobs/standard-tests-jobs.yml b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml
index beeb63f3d..9eb77db78 100644
--- a/.azure-pipelines/templates/jobs/standard-tests-jobs.yml
+++ b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml
@@ -1,8 +1,5 @@
 jobs:
   - job: test
-    variables:
-      ${{ if contains(variables['TOXENV'], 'integration') }}:
-        PYTEST_ADDOPTS: --numprocesses 4
     strategy:
       matrix:
         macos-py27: