let apacheconftest handle deps

Revert "We don't need to run dpkg -s in before_install."
This reverts commit e5d35099a7.
2018-07-05 18:38:09 -07:00 · 2018-07-05 18:37:27 -07:00 · 2018-07-05 17:52:34 -07:00 · 2018-07-05 17:51:23 -07:00 · 2018-07-05 17:51:05 -07:00 · 2018-07-05 17:48:19 -07:00
2 changed files with 56 additions and 6 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,22 +5,62 @@ cache:
        - $HOME/.cache/pip

 before_install:
-  - 'if [ $TRAVIS_OS_NAME = osx ] ; then brew update && brew install augeas python3 && brew upgrade python && brew link python; fi'
+  - '([ $TRAVIS_OS_NAME == linux ] && dpkg -s libaugeas0) || (brew update && brew install augeas python3 && brew upgrade python && brew link python)'

 before_script:
  - 'if [ $TRAVIS_OS_NAME = osx ] ; then ulimit -n 1024 ; fi'

-env:
-  global:
-    - RUNLEVEL=1
-
 matrix:
  include:
+    - python: "2.7"
+      env: TOXENV=py27_install BOULDER_INTEGRATION=v1
+      sudo: required
+      services: docker
+    - python: "2.7"
+      env: TOXENV=py27_install BOULDER_INTEGRATION=v2
+      sudo: required
+      services: docker
+    - python: "2.7"
+      env: TOXENV=cover FYI="this also tests py27"
+    - sudo: required
+      env: TOXENV=nginx_compat
+      services: docker
+      before_install:
+      addons:
+    - python: "2.7"
+      env: TOXENV=lint
+    - python: "3.4"
+      env: TOXENV=mypy
+    - python: "3.5"
+      env: TOXENV=mypy
+    - python: "2.7"
+      env: TOXENV='py27-{acme,apache,certbot,dns,nginx}-oldest'
+      sudo: required
+      services: docker
+    - python: "3.4"
+      env: TOXENV=py34
+      sudo: required
+      services: docker
    - python: "3.7"
      dist: xenial
      env: TOXENV=py37
      sudo: required
-      services: nginx
+      services: docker
+    - sudo: required
+      env: TOXENV=apache_compat
+      services: docker
+      before_install:
+      addons:
+    - sudo: required
+      env: TOXENV=le_auto_trusty
+      services: docker
+      before_install:
+      addons:
+    - python: "2.7"
+      env: TOXENV=apacheconftest
+      sudo: required
+    - python: "2.7"
+      env: TOXENV=nginxroundtrip


 # Only build pushes to the master branch, PRs, and branches beginning with
@@ -46,6 +86,8 @@ addons:
    - libssl-dev
    - libffi-dev
    - ca-certificates
+    # For certbot-nginx integration testing
+    - nginx-light
    - openssl

 install: "travis_retry $(command -v pip || command -v pip3) install tox coveralls"
@@ -57,3 +99,10 @@ after_success: '[ "$TOXENV" == "cover" ] && coveralls'

 notifications:
  email: false
+  irc:
+    channels:
+      - secure: "SGWZl3ownKx9xKVV2VnGt7DqkTmutJ89oJV9tjKhSs84kLijU6EYdPnllqISpfHMTxXflNZuxtGo0wTDYHXBuZL47w1O32W6nzuXdra5zC+i4sYQwYULUsyfOv9gJX8zWAULiK0Z3r0oho45U+FR5ZN6TPCidi8/eGU+EEPwaAw="
+    on_cancel: never
+    on_success: never
+    on_failure: always
+    use_notice: true
--- a/certbot-apache/certbot_apache/tests/apache-conf-files/apache-conf-test
+++ b/certbot-apache/certbot_apache/tests/apache-conf-files/apache-conf-test
@@ -46,6 +46,7 @@ function Cleanup() {

 # if our environment asks us to enable modules, do our best!
 if [ "$1" = --debian-modules ] ; then
+    sudo apt-get install -y apache2
    sudo apt-get install -y libapache2-mod-wsgi
    sudo apt-get install -y libapache2-mod-macro
Author	SHA1	Message	Date
Brad Warren	cc85d309a9	let apacheconftest handle deps	2018-07-05 18:38:09 -07:00
Brad Warren	c1b4f21325	Revert "We don't need to run dpkg -s in before_install." This reverts commit `e5d35099a7`.	2018-07-05 18:37:27 -07:00
Brad Warren	29a75eb8a7	Upgrade Python 3.6 tests to 3.7. Let's continue the approach of testing on the oldest and newest versions of Python 3. We will continue testing on Python 3.6 in the nightly tests.	2018-07-05 17:52:34 -07:00
Brad Warren	309a70c3fe	Remove augeas sources. We only needed it for Ubuntu Precise which is dead and it doesn't work in Ubuntu Xenial.	2018-07-05 17:51:23 -07:00
Brad Warren	e5d35099a7	We don't need to run dpkg -s in before_install.	2018-07-05 17:51:05 -07:00
Brad Warren	9fade9c85c	Remove apacheconftest packages. The apacheconftests handle installing Apache dependencies, so let's remove it from the general case.	2018-07-05 17:48:19 -07:00