From 64f15cb302c92ebe6551ec1c6c90d1260ac0df43 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Tue, 4 Oct 2022 12:41:31 -0700
Subject: [PATCH] fast and loud

---
 .../templates/jobs/extended-tests-jobs.yml    | 22 -------------------
 .../stages/test-and-package-stage.yml         |  2 --
 tox.ini                                       | 12 +++++-----
 3 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
index 7c586ee5b..f9329eb2b 100644
--- a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
+++ b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
@@ -8,18 +8,6 @@ jobs:
       - group: certbot-common
     strategy:
       matrix:
-        linux-py38:
-          PYTHON_VERSION: 3.8
-          TOXENV: py38
-        linux-py39:
-          PYTHON_VERSION: 3.9
-          TOXENV: py39
-        linux-py37-nopin:
-          PYTHON_VERSION: 3.7
-          TOXENV: py37
-          CERTBOT_NO_PIN: 1
-        linux-external-mock:
-          TOXENV: external-mock
         linux-boulder-v2-integration-certbot-oldest:
           PYTHON_VERSION: 3.7
           TOXENV: integration-certbot-oldest
@@ -44,20 +32,10 @@ jobs:
           PYTHON_VERSION: 3.10
           TOXENV: integration
           ACME_SERVER: boulder-v2
-        nginx-compat:
-          TOXENV: nginx_compat
         linux-integration-rfc2136:
           IMAGE_NAME: ubuntu-22.04
           PYTHON_VERSION: 3.8
           TOXENV: integration-dns-rfc2136
-        docker-dev:
-          TOXENV: docker_dev
-        le-modification:
-          IMAGE_NAME: ubuntu-22.04
-          TOXENV: modification
-        farmtest-apache2:
-          PYTHON_VERSION: 3.8
-          TOXENV: test-farm-apache2
     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..f5a10478f 100644
--- a/.azure-pipelines/templates/stages/test-and-package-stage.yml
+++ b/.azure-pipelines/templates/stages/test-and-package-stage.yml
@@ -1,6 +1,4 @@
 stages:
   - stage: TestAndPackage
     jobs:
-      - template: ../jobs/standard-tests-jobs.yml
       - template: ../jobs/extended-tests-jobs.yml
-      - template: ../jobs/packaging-jobs.yml
diff --git a/tox.ini b/tox.ini
index 03f638c0e..8a0da92c2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -194,7 +194,7 @@ passenv = DOCKER_*
 [testenv:integration]
 commands =
     {[base]pip_install} acme certbot certbot-nginx certbot-ci
-    pytest certbot-ci/certbot_integration_tests \
+    pytest -vvv certbot-ci/certbot_integration_tests \
         --acme-server={env:ACME_SERVER:pebble} \
         --cov=acme --cov=certbot --cov=certbot_nginx --cov-report= \
         --cov-config=certbot-ci/certbot_integration_tests/.coveragerc
@@ -205,7 +205,7 @@ passenv = DOCKER_*
 [testenv:integration-certbot]
 commands =
     {[base]pip_install} acme certbot certbot-ci
-    pytest certbot-ci/certbot_integration_tests/certbot_tests \
+    pytest -vvvv certbot-ci/certbot_integration_tests/certbot_tests \
         --acme-server={env:ACME_SERVER:pebble} \
         --cov=acme --cov=certbot --cov-report= \
         --cov-config=certbot-ci/certbot_integration_tests/.coveragerc
@@ -214,7 +214,7 @@ commands =
 [testenv:integration-dns-rfc2136]
 commands =
     {[base]pip_install} acme certbot certbot-dns-rfc2136 certbot-ci
-    pytest certbot-ci/certbot_integration_tests/rfc2136_tests \
+    pytest -vvv certbot-ci/certbot_integration_tests/rfc2136_tests \
         --acme-server=pebble --dns-server=bind \
         --numprocesses=1 \
         --cov=acme --cov=certbot --cov=certbot_dns_rfc2136 --cov-report= \
@@ -226,7 +226,7 @@ commands =
 # Run integration tests with Certbot outside of tox's virtual environment.
 commands =
     {[base]pip_install} certbot-ci
-    pytest certbot-ci/certbot_integration_tests \
+    pytest -vvv certbot-ci/certbot_integration_tests \
         --acme-server={env:ACME_SERVER:pebble}
 passenv = DOCKER_*
 
@@ -235,7 +235,7 @@ basepython =
     {[testenv:oldest]basepython}
 commands =
     {[base]pip_install} acme certbot certbot-ci
-    pytest certbot-ci/certbot_integration_tests/certbot_tests \
+    pytest -vvv certbot-ci/certbot_integration_tests/certbot_tests \
         --acme-server={env:ACME_SERVER:pebble}
 passenv = DOCKER_*
 setenv = {[testenv:oldest]setenv}
@@ -245,7 +245,7 @@ basepython =
     {[testenv:oldest]basepython}
 commands =
     {[base]pip_install} acme certbot certbot-nginx certbot-ci
-    pytest certbot-ci/certbot_integration_tests/nginx_tests \
+    pytest -vvv certbot-ci/certbot_integration_tests/nginx_tests \
         --acme-server={env:ACME_SERVER:pebble}
 passenv = DOCKER_*
 setenv = {[testenv:oldest]setenv}