simplify testing & debugging

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

.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

certbot-ci/certbot_integration_tests/utils/acme_server.py

@@ -60,7 +60,8 @@ class ACMEServer:
         self._proxy = http_proxy
         self._workspace = tempfile.mkdtemp()
         self._processes: List[subprocess.Popen] = []
-        self._stdout = sys.stdout if stdout else open(os.devnull, 'w') # pylint: disable=consider-using-with
+        # Always use sys.stdout for now for debugging purposes
+        self._stdout = sys.stdout #  if stdout else open(os.devnull, 'w') # pylint: disable=consider-using-with
         self._dns_server = dns_server
         self._http_01_port = http_01_port
         if http_01_port != DEFAULT_HTTP_01_PORT:
@@ -94,7 +95,7 @@ class ACMEServer:
                     if e.errno != errno.ESRCH:
                         raise
             for process in self._processes:
-                process.wait()
+                process.wait(300)
 
             if os.path.exists(os.path.join(self._workspace, 'boulder')):
                 # Boulder docker generates build artifacts owned by root with 0o744 permissions.
@@ -104,7 +105,7 @@ class ACMEServer:
                 process = self._launch_process(['docker', 'run', '--rm', '-v',
                                                 '{0}:/workspace'.format(self._workspace),
                                                 'alpine', 'rm', '-rf', '/workspace/boulder'])
-                process.wait()
+                process.wait(300)
         finally:
             if os.path.exists(self._workspace):
                 shutil.rmtree(self._workspace)

certbot-ci/setup.py

@@ -15,7 +15,6 @@ if parse_version(setuptools_version) < parse_version(min_setuptools_version):
 install_requires = [
     'coverage',
     'cryptography',
-    'docker-compose',
     'pyopenssl',
     'pytest',
     'pytest-cov',

tox.ini

@@ -41,7 +41,7 @@ commands =
 # https://github.com/certbot/certbot/issues/7745.
 recreate = true
 setenv =
-    PYTEST_ADDOPTS = {env:PYTEST_ADDOPTS:--numprocesses auto}
+    PYTEST_ADDOPTS = {env:PYTEST_ADDOPTS:-s -vvv}
     PYTHONHASHSEED = 0
 
 [testenv:oldest]