From 693bac4b4943898ced3397fa0d6e436ef2343159 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@users.noreply.github.com>
Date: Wed, 16 Jan 2019 13:17:37 -0800
Subject: [PATCH] Update outdated tests (#6515)

These tests were running on Ubuntu Precise and Debian Wheezy which have reached their end of life and are no longer maintained by the respective distros. This updates the tests to a newer version of Debian and Ubuntu.

* Remove tests on the deprecated precise.

* Add tests for Xenial.

* update Jessie tests to use Wheezy

* update .travis.yml
---
 .travis.yml                                   |  4 ++--
 .../{Dockerfile.wheezy => Dockerfile.jessie}  |  2 +-
 .../{Dockerfile.precise => Dockerfile.xenial} |  2 +-
 tox.ini                                       | 24 +++++++++----------
 4 files changed, 15 insertions(+), 17 deletions(-)
 rename letsencrypt-auto-source/{Dockerfile.wheezy => Dockerfile.jessie} (98%)
 rename letsencrypt-auto-source/{Dockerfile.precise => Dockerfile.xenial} (98%)

diff --git a/.travis.yml b/.travis.yml
index e733c5fc7..38543845a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -126,11 +126,11 @@ matrix:
       services: docker
       if: type = cron
     - sudo: required
-      env: TOXENV=le_auto_precise
+      env: TOXENV=le_auto_xenial
       services: docker
       if: type = cron
     - sudo: required
-      env: TOXENV=le_auto_wheezy
+      env: TOXENV=le_auto_jessie
       services: docker
       if: type = cron
     - sudo: required
diff --git a/letsencrypt-auto-source/Dockerfile.wheezy b/letsencrypt-auto-source/Dockerfile.jessie
similarity index 98%
rename from letsencrypt-auto-source/Dockerfile.wheezy
rename to letsencrypt-auto-source/Dockerfile.jessie
index f4f3fea15..9ee37b763 100644
--- a/letsencrypt-auto-source/Dockerfile.wheezy
+++ b/letsencrypt-auto-source/Dockerfile.jessie
@@ -1,7 +1,7 @@
 # For running tests, build a docker image with a passwordless sudo and a trust
 # store we can manipulate.
 
-FROM debian:wheezy
+FROM debian:jessie
 
 # Add an unprivileged user:
 RUN useradd --create-home --home-dir /home/lea --shell /bin/bash --groups sudo --uid 1000 lea
diff --git a/letsencrypt-auto-source/Dockerfile.precise b/letsencrypt-auto-source/Dockerfile.xenial
similarity index 98%
rename from letsencrypt-auto-source/Dockerfile.precise
rename to letsencrypt-auto-source/Dockerfile.xenial
index 39a167c14..931f1c6d3 100644
--- a/letsencrypt-auto-source/Dockerfile.precise
+++ b/letsencrypt-auto-source/Dockerfile.xenial
@@ -1,7 +1,7 @@
 # For running tests, build a docker image with a passwordless sudo and a trust
 # store we can manipulate.
 
-FROM ubuntu:precise
+FROM ubuntu:xenial
 
 # Add an unprivileged user:
 RUN useradd --create-home --home-dir /home/lea --shell /bin/bash --groups sudo --uid 1000 lea
diff --git a/tox.ini b/tox.ini
index 95b2f2c64..36057b5df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -198,17 +198,6 @@ whitelist_externals =
 passenv =
     DOCKER_*
 
-[testenv:le_auto_precise]
-# At the moment, this tests under Python 2.7 only, as only that version is
-# readily available on the Precise Docker image.
-commands =
-    docker build -f letsencrypt-auto-source/Dockerfile.precise -t lea letsencrypt-auto-source
-    docker run --rm -t -i lea
-whitelist_externals =
-    docker
-passenv =
-    DOCKER_*
-
 [testenv:le_auto_trusty]
 # At the moment, this tests under Python 2.7 only, as only that version is
 # readily available on the Trusty Docker image.
@@ -222,11 +211,20 @@ passenv =
     DOCKER_*
     TRAVIS_BRANCH
 
-[testenv:le_auto_wheezy]
+[testenv:le_auto_xenial]
+# At the moment, this tests under Python 2.7 only.
+commands =
+    docker build -f letsencrypt-auto-source/Dockerfile.xenial -t lea letsencrypt-auto-source
+    docker run --rm -t -i lea
+whitelist_externals =
+    docker
+passenv = DOCKER_*
+
+[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.wheezy -t lea letsencrypt-auto-source
+    docker build -f letsencrypt-auto-source/Dockerfile.jessie -t lea letsencrypt-auto-source
     docker run --rm -t -i lea
 whitelist_externals =
     docker