From 6581aea552c828d3071188d8583dc558ac528022 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Wed, 7 Oct 2020 10:35:22 -0700
Subject: [PATCH] Remove le_auto_xenial test.

---
 .../templates/jobs/extended-tests-jobs.yml    |  2 --
 .../templates/jobs/standard-tests-jobs.yml    |  4 +--
 letsencrypt-auto-source/Dockerfile.xenial     | 36 -------------------
 tox.ini                                       | 17 +++------
 4 files changed, 6 insertions(+), 53 deletions(-)
 delete mode 100644 letsencrypt-auto-source/Dockerfile.xenial

diff --git a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
index 67fa34880..c22f1003f 100644
--- a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
+++ b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
@@ -64,8 +64,6 @@ jobs:
           ACME_SERVER: boulder-v2
         nginx-compat:
           TOXENV: nginx_compat
-        le-auto-centos6:
-          TOXENV: le_auto_centos6
         le-auto-oraclelinux6:
           TOXENV: le_auto_oraclelinux6
         docker-dev:
diff --git a/.azure-pipelines/templates/jobs/standard-tests-jobs.yml b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml
index d5b3a0a16..69e8b279b 100644
--- a/.azure-pipelines/templates/jobs/standard-tests-jobs.yml
+++ b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml
@@ -58,9 +58,9 @@ jobs:
         apache-compat:
           IMAGE_NAME: ubuntu-18.04
           TOXENV: apache_compat
-        le-auto-xenial:
+        le-auto-centos6:
           IMAGE_NAME: ubuntu-18.04
-          TOXENV: le_auto_xenial
+          TOXENV: le_auto_centos6
         apacheconftest:
           IMAGE_NAME: ubuntu-18.04
           PYTHON_VERSION: 2.7
diff --git a/letsencrypt-auto-source/Dockerfile.xenial b/letsencrypt-auto-source/Dockerfile.xenial
deleted file mode 100644
index 931f1c6d3..000000000
--- a/letsencrypt-auto-source/Dockerfile.xenial
+++ /dev/null
@@ -1,36 +0,0 @@
-# For running tests, build a docker image with a passwordless sudo and a trust
-# store we can manipulate.
-
-FROM ubuntu:xenial
-
-# 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/tox.ini b/tox.ini
index ce0db4905..9412a2349 100644
--- a/tox.ini
+++ b/tox.ini
@@ -188,11 +188,12 @@ whitelist_externals =
 passenv =
     DOCKER_*
 
-[testenv:le_auto_xenial]
-# At the moment, this tests under Python 2.7 only.
+[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.
 commands =
     python {toxinidir}/tests/modification-check.py
-    docker build -f letsencrypt-auto-source/Dockerfile.xenial -t lea letsencrypt-auto-source
+    docker build -f letsencrypt-auto-source/Dockerfile.redhat6 --build-arg REDHAT_DIST_FLAVOR=centos -t lea letsencrypt-auto-source
     docker run --rm -t lea
 whitelist_externals =
     docker
@@ -200,16 +201,6 @@ passenv =
     DOCKER_*
     TARGET_BRANCH
 
-[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.
-commands =
-    docker build -f letsencrypt-auto-source/Dockerfile.redhat6 --build-arg REDHAT_DIST_FLAVOR=centos -t lea letsencrypt-auto-source
-    docker run --rm -t lea
-whitelist_externals =
-    docker
-passenv = DOCKER_*
-
 [testenv:le_auto_oraclelinux6]
 # At the moment, this tests under Python 2.6 only, as only that version is
 # readily available on the Oracle Linux 6 Docker image.