From 151cf204c0010f26b8ea54976d93cc397db81009 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Thu, 16 Aug 2018 11:12:26 -0700
Subject: [PATCH] test it

---
 .travis.yml | 98 +++--------------------------------------------------
 1 file changed, 4 insertions(+), 94 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5fced1fc6..897460bc5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,6 @@ before_install:
   # 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 master --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 == linux ] && dpkg -s libaugeas0) || (brew update && brew install augeas && brew upgrade python python3 && brew link python)'
 
 before_script:
@@ -20,101 +17,21 @@ before_script:
 matrix:
   include:
     - python: "2.7"
-      env: TOXENV=cover FYI="this also tests py27"
-    - python: "2.7"
-      env: TOXENV=lint
-    - python: "2.7"
-      env: TOXENV=py27-nginx-oldest BOULDER_INTEGRATION=v1
+      env: TOXENV=py27-certbot-oldest BOULDER_INTEGRATION=v1 INTEGRATION=nginx
       sudo: required
       services: docker
     - python: "2.7"
-      env: TOXENV=py27-nginx-oldest BOULDER_INTEGRATION=v2
+      env: TOXENV=py27-certbot-oldest BOULDER_INTEGRATION=v2 INTEGRATION=nginx
       sudo: required
       services: docker
     - python: "2.7"
-      env: TOXENV=py27_install BOULDER_INTEGRATION=v2
+      env: TOXENV=py27-nginx-oldest BOULDER_INTEGRATION=v1 INTEGRATION=nginx
       sudo: required
       services: docker
     - python: "2.7"
-      env: TOXENV=py27_install BOULDER_INTEGRATION=v1
+      env: TOXENV=py27-nginx-oldest BOULDER_INTEGRATION=v2 INTEGRATION=nginx
       sudo: required
       services: docker
-    - python: "2.7"
-      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
-    - 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=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: "3.4"
-      env: TOXENV=py34 BOULDER_INTEGRATION=v2
-      sudo: required
-      services: docker
-    - python: "3.5"
-      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 BOULDER_INTEGRATION=v1
-      sudo: required
-      services: docker
-    - python: "3.7"
-      dist: xenial
-      env: TOXENV=py37 BOULDER_INTEGRATION=v2
-      sudo: required
-      services: docker
-    - python: "2.7"
-      env: TOXENV=nginxroundtrip
-    - language: generic
-      env: TOXENV=py27
-      os: osx
-    - language: generic
-      env: TOXENV=py37
-      os: osx
 
 
 # Only build pushes to the master branch, PRs, and branches beginning with
@@ -153,10 +70,3 @@ after_success: '[ "$TOXENV" == "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