Drop support for Ubuntu Trusty (#7190)

* Remove references and tests for Ubuntu Trusty.

* Mention dropped support in changelog.

.travis.yml

@@ -72,12 +72,6 @@ matrix:
       before_install:
       addons:
       <<: *not-on-master
-    - sudo: required
-      env: TOXENV=le_auto_trusty
-      services: docker
-      before_install:
-      addons:
-      <<: *not-on-master
     - python: "2.7"
       env: TOXENV=apacheconftest-with-pebble
       sudo: required

CHANGELOG.md

@@ -11,6 +11,7 @@ Certbot adheres to [Semantic Versioning](https://semver.org/).
 
 ### Changed
 
+* Support for Ubuntu 14.04 Trusty has been removed.
 * Update the 'manage your account' help to be more generic.
 * The error message when Certbot's Apache plugin is unable to modify your
   Apache configuration has been improved.

certbot-apache/certbot_apache/configurator.py

@@ -74,9 +74,6 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
     # pylint: disable=too-many-instance-attributes,too-many-public-methods
     """Apache configurator.
 
-    State of Configurator: This code has been been tested and built for Ubuntu
-    14.04 Apache 2.4 and it works for Ubuntu 12.04 Apache 2.2
-
     :ivar config: Configuration.
     :type config: :class:`~certbot.interfaces.IConfig`
 

letsencrypt-auto-source/Dockerfile.trusty

@@ -1,36 +0,0 @@
-# For running tests, build a docker image with a passwordless sudo and a trust
-# store we can manipulate.
-
-FROM ubuntu:trusty
-
-# Add an unprivileged user:
-RUN useradd --create-home --home-dir /home/lea --shell /bin/bash --groups sudo --uid 1000 lea
-
-# Let that user sudo:
-RUN sed -i.bkp -e \
-      's/%sudo\s\+ALL=(ALL\(:ALL\)\?)\s\+ALL/%sudo ALL=NOPASSWD:ALL/g' \
-      /etc/sudoers
-
-# Install pip:
-RUN apt-get update && \
-    apt-get -q -y install python-pip && \
-    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
-
-RUN mkdir -p /home/lea/certbot
-
-# Install fake testing CA:
-COPY ./tests/certs/ca/my-root-ca.crt.pem /usr/local/share/ca-certificates/
-RUN update-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"]

letsencrypt-auto-source/rebuild_dependencies.py

@@ -26,7 +26,7 @@ import argparse
 
 # The list of docker distributions to test dependencies against with.
 DISTRIBUTION_LIST = [
-    'ubuntu:18.04', 'ubuntu:14.04',
+    'ubuntu:18.04', 'ubuntu:16.04',
     'debian:stretch', 'debian:jessie',
     'centos:7', 'centos:6',
     'opensuse/leap:15',

tests/letstest/apache2_targets.yaml

@@ -16,16 +16,6 @@ targets:
     type: ubuntu
     virt: hvm
     user: ubuntu
-  - ami: ami-7b89cc11
-    name: ubuntu14.04LTS
-    type: ubuntu
-    virt: hvm
-    user: ubuntu
-  - ami: ami-9295d0f8
-    name: ubuntu14.04LTS_32bit
-    type: ubuntu
-    virt: pv
-    user: ubuntu
   #-----------------------------------------------------------------------------
   # Debian
   - ami: ami-003f19e0e687de1cd

tests/letstest/scripts/boulder_install.sh

@@ -1,7 +1,5 @@
 #!/bin/bash -x
 
-# >>>> only tested on Ubuntu 14.04LTS <<<<
-
 # Check out special branch until latest docker changes land in Boulder master.
 git clone -b docker-integration https://github.com/letsencrypt/boulder $BOULDERPATH
 cd $BOULDERPATH

tests/letstest/targets.yaml

@@ -16,16 +16,6 @@ targets:
     type: ubuntu
     virt: hvm
     user: ubuntu
-  - ami: ami-7b89cc11
-    name: ubuntu14.04LTS
-    type: ubuntu
-    virt: hvm
-    user: ubuntu
-  - ami: ami-9295d0f8
-    name: ubuntu14.04LTS_32bit
-    type: ubuntu
-    virt: pv
-    user: ubuntu
   #-----------------------------------------------------------------------------
   # Debian
   - ami: ami-003f19e0e687de1cd

tox.ini

@@ -180,12 +180,11 @@ whitelist_externals =
 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.
+[testenv:le_auto_xenial]
+# At the moment, this tests under Python 2.7 only.
 commands =
     python {toxinidir}/tests/modification-check.py
-    docker build -f letsencrypt-auto-source/Dockerfile.trusty -t lea letsencrypt-auto-source
+    docker build -f letsencrypt-auto-source/Dockerfile.xenial -t lea letsencrypt-auto-source
     docker run --rm -t -i lea
 whitelist_externals =
     docker
@@ -193,15 +192,6 @@ passenv =
     DOCKER_*
     TRAVIS_BRANCH
 
-[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.