From 8574313841b140bbc00f3d7e2036db0794ab6d6c Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@users.noreply.github.com>
Date: Fri, 7 Aug 2020 13:35:21 -0700
Subject: [PATCH] Remove final jessie references outside of cb-auto. (#8194)

---
 .../templates/jobs/extended-tests-jobs.yml    |  2 --
 letsencrypt-auto-source/Dockerfile.jessie     | 35 -------------------
 .../rebuild_dependencies.py                   |  2 +-
 tox.ini                                       | 10 ------
 4 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 letsencrypt-auto-source/Dockerfile.jessie

diff --git a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
index 9f0a3ab9b7b..2b7b04ef6a3 100644
--- a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
+++ b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
@@ -70,8 +70,6 @@ jobs:
           ACME_SERVER: boulder-v2
         nginx-compat:
           TOXENV: nginx_compat
-        le-auto-jessie:
-          TOXENV: le_auto_jessie
         le-auto-centos6:
           TOXENV: le_auto_centos6
         le-auto-oraclelinux6:
diff --git a/letsencrypt-auto-source/Dockerfile.jessie b/letsencrypt-auto-source/Dockerfile.jessie
deleted file mode 100644
index 9ee37b763ec..00000000000
--- a/letsencrypt-auto-source/Dockerfile.jessie
+++ /dev/null
@@ -1,35 +0,0 @@
-# For running tests, build a docker image with a passwordless sudo and a trust
-# store we can manipulate.
-
-FROM debian:jessie
-
-# Add an unprivileged user:
-RUN useradd --create-home --home-dir /home/lea --shell /bin/bash --groups sudo --uid 1000 lea
-
-# Install pip, sudo, and openssl:
-RUN apt-get update && \
-    apt-get -q -y install python-pip sudo openssl && \
-    apt-get clean
-# Use pipstrap to update to a stable and tested version of pip
-COPY ./pieces/pipstrap.py /opt
-RUN /opt/pipstrap.py
-# Pin pytest version for increased stability
-RUN pip install pytest==3.2.5 six==1.10.0
-
-# Let that user sudo:
-RUN sed -i.bkp -e \
-      's/%sudo\s\+ALL=(ALL\(:ALL\)\?)\s\+ALL/%sudo ALL=NOPASSWD:ALL/g' \
-      /etc/sudoers
-
-RUN mkdir -p /home/lea/certbot
-
-# Install fake testing CA:
-COPY ./tests/certs/ca/my-root-ca.crt.pem /usr/local/share/ca-certificates/
-
-# Copy code:
-COPY . /home/lea/certbot/letsencrypt-auto-source
-
-USER lea
-WORKDIR /home/lea
-
-CMD ["pytest", "-v", "-s", "certbot/letsencrypt-auto-source/tests"]
diff --git a/letsencrypt-auto-source/rebuild_dependencies.py b/letsencrypt-auto-source/rebuild_dependencies.py
index 9fc0ff32474..864394661fc 100755
--- a/letsencrypt-auto-source/rebuild_dependencies.py
+++ b/letsencrypt-auto-source/rebuild_dependencies.py
@@ -46,7 +46,7 @@
     # certbot-auto failures on Python 3.6+ which enum34 doesn't support. See #5456.
     'enum34': '1.1.10; python_version < \'3.4\'',
     # Cryptography 2.9+ drops support for OpenSSL 1.0.1, but we still want to support it
-    # for officially supported non-x86_64 ancient distributions like RHEL 6 or Debian 8.
+    # for officially supported non-x86_64 ancient distributions like RHEL 6.
     'cryptography': '2.8',
     # Parsedatetime 2.6 is broken on Python 2.7, see https://github.com/bear/parsedatetime/issues/246
     'parsedatetime': '2.5',
diff --git a/tox.ini b/tox.ini
index a009ba21986..c61379b9461 100644
--- a/tox.ini
+++ b/tox.ini
@@ -199,16 +199,6 @@ passenv =
     DOCKER_*
     TARGET_BRANCH
 
-[testenv:le_auto_jessie]
-# At the moment, this tests under Python 2.7 only, as only that version is
-# readily available on the Wheezy Docker image.
-commands =
-    docker build -f letsencrypt-auto-source/Dockerfile.jessie -t lea letsencrypt-auto-source
-    docker run --rm -t lea
-whitelist_externals =
-    docker
-passenv = DOCKER_*
-
 [testenv:le_auto_centos6]
 # At the moment, this tests under Python 2.6 only, as only that version is
 # readily available on the CentOS 6 Docker image.