Skip to content

Commit

Permalink
Update outdated tests (certbot#6515)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bmw authored Jan 16, 2019
1 parent d3a8a54 commit 693bac4
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
24 changes: 11 additions & 13 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down

0 comments on commit 693bac4

Please sign in to comment.