setup tests

Fix merge conflicts in test-everything

.travis.yml

@@ -5,13 +5,40 @@ cache:
         - $HOME/.cache/pip
 
 before_install:
-  - '([ $TRAVIS_OS_NAME == linux ] && dpkg -s libaugeas0) || (brew update && brew install augeas python3 && brew upgrade python && brew link python)'
+  # In the test-everything branch, we merge master before running tests.
+  # This is because we want test-everything to test the code in master nightly
+  # in a Travis cron, but with a different set of tests than master has
+  # in .travis.yml.
+  - cp .travis.yml /tmp/travis.yml
+  - git pull origin fix-integration --strategy=recursive --strategy-option=theirs --no-edit
+  - if ! git diff .travis.yml /tmp/travis.yml ; then echo "Please merge master into test-everything"; exit 1; fi
+  - '[ "$TRAVIS_OS_NAME" != osx ] || tests/travis-macos-setup.sh'
 
 before_script:
   - 'if [ $TRAVIS_OS_NAME = osx ] ; then ulimit -n 1024 ; fi'
 
 matrix:
   include:
+    - python: "2.7"
+      env: TOXENV=py27-cover FYI="py27 tests + code coverage"
+    - python: "2.7"
+      env: TOXENV=lint
+    - python: "2.7"
+      env: BOULDER_INTEGRATION=v1 INTEGRATION_TEST=certbot TOXENV=py27-certbot-oldest
+      sudo: required
+      services: docker
+    - python: "2.7"
+      env: BOULDER_INTEGRATION=v2 INTEGRATION_TEST=certbot TOXENV=py27-certbot-oldest
+      sudo: required
+      services: docker
+    - python: "2.7"
+      env: BOULDER_INTEGRATION=v1 INTEGRATION_TEST=nginx TOXENV=py27-nginx-oldest
+      sudo: required
+      services: docker
+    - python: "2.7"
+      env: BOULDER_INTEGRATION=v2 INTEGRATION_TEST=nginx TOXENV=py27-nginx-oldest
+      sudo: required
+      services: docker
     - python: "2.7"
       env: BOULDER_INTEGRATION=v1 INTEGRATION_TEST=all TOXENV=py27_install
       sudo: required
@@ -21,46 +48,81 @@ matrix:
       sudo: required
       services: docker
     - python: "2.7"
-      env: TOXENV=py27-cover FYI="py27 tests + code coverage"
+      env: TOXENV='py27-{acme,apache,certbot,dns,postfix}-oldest'
+    - sudo: required
+      env: TOXENV=apache_compat
+      services: docker
     - sudo: required
       env: TOXENV=nginx_compat
       services: docker
-      before_install:
+    - sudo: required
+      env: TOXENV=le_auto_precise
+      services: docker
+    - sudo: required
+      env: TOXENV=le_auto_trusty
+      services: docker
+    - sudo: required
+      env: TOXENV=le_auto_wheezy
+      services: docker
+    - sudo: required
+      env: TOXENV=le_auto_centos6
+      services: docker
+    - sudo: required
+      env: TOXENV=docker_dev
+      services: docker
       addons:
+        apt:
+          packages:  # don't install nginx and apache
+          - libaugeas0
     - python: "2.7"
-      env: TOXENV=lint
+      env: TOXENV=apacheconftest
+      sudo: required
+    - python: "3.4"
+      env: TOXENV=py34 BOULDER_INTEGRATION=v1
+      sudo: required
+      services: docker
     - python: "3.4"
       env: TOXENV=mypy
     - python: "3.5"
       env: TOXENV=mypy
-    - python: "2.7"
+    - python: "3.4"
-      env: TOXENV='py27-{acme,apache,certbot,dns,nginx,postfix}-oldest'
+      env: TOXENV=py34 BOULDER_INTEGRATION=v2
       sudo: required
       services: docker
-    - python: "3.4"
+    - python: "3.5"
-      env: TOXENV=py34
+      env: TOXENV=py35 BOULDER_INTEGRATION=v1
+      sudo: required
+      services: docker
+    - python: "3.5"
+      env: TOXENV=py35 BOULDER_INTEGRATION=v2
+      sudo: required
+      services: docker
+    - python: "3.6"
+      env: TOXENV=py36 BOULDER_INTEGRATION=v1
+      sudo: required
+      services: docker
+    - python: "3.6"
+      env: TOXENV=py36 BOULDER_INTEGRATION=v2
       sudo: required
       services: docker
     - python: "3.7"
       dist: xenial
-      env: TOXENV=py37
+      env: TOXENV=py37 BOULDER_INTEGRATION=v1
       sudo: required
       services: docker
-    - sudo: required
+    - python: "3.7"
-      env: TOXENV=apache_compat
+      dist: xenial
-      services: docker
+      env: TOXENV=py37 BOULDER_INTEGRATION=v2
-      before_install:
-      addons:
-    - sudo: required
-      env: TOXENV=le_auto_trusty
-      services: docker
-      before_install:
-      addons:
-    - python: "2.7"
-      env: TOXENV=apacheconftest
       sudo: required
+      services: docker
     - python: "2.7"
       env: TOXENV=nginxroundtrip
+    - language: generic
+      env: TOXENV=py27
+      os: osx
+    - language: generic
+      env: TOXENV=py3
+      os: osx
 
 
 # Only build pushes to the master branch, PRs, and branches beginning with
@@ -99,10 +161,3 @@ after_success: '[ "$TOXENV" == "py27-cover" ] && codecov'
 
 notifications:
   email: false
-  irc:
-    channels:
-      - secure: "SGWZl3ownKx9xKVV2VnGt7DqkTmutJ89oJV9tjKhSs84kLijU6EYdPnllqISpfHMTxXflNZuxtGo0wTDYHXBuZL47w1O32W6nzuXdra5zC+i4sYQwYULUsyfOv9gJX8zWAULiK0Z3r0oho45U+FR5ZN6TPCidi8/eGU+EEPwaAw="
-    on_cancel: never
-    on_success: never
-    on_failure: always
-    use_notice: true

tests/travis-macos-setup.sh

@@ -0,0 +1,17 @@
+#!/bin/bash -e
+#
+# Set up the test environment for macOS on Travis.
+
+# Install the given package with brew if it's not already installed.
+brew_install() {
+    if ! brew list "$1" > /dev/null 2>&1; then
+        brew install "$1"
+    fi
+}
+
+brew_install augeas
+brew_install python
+brew_install python3
+
+# Ensure we use python from brew.
+brew link python