Simplify config

.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:

.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

.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: