From 587e2e76f3034d8fefce6acd54bee45dc46284dd Mon Sep 17 00:00:00 2001
From: Brad Warren <bradmw@umich.edu>
Date: Wed, 13 Jan 2016 13:25:29 -0800
Subject: [PATCH] Revert "Get all tests, even le_auto, working on Travis."

This reverts commit 7ee23b723af6b7cb62f23f2bfdc2e472d80f89ec.
---
 .travis.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ab81f20b2..d9b4cb5ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,14 +2,13 @@ language: python
 
 services:
   - rabbitmq
+  - mariadb
   # apacheconftest
   #- apache2
 
 # http://docs.travis-ci.com/user/ci-environment/#CI-environment-OS
 # gimme has to be kept in sync with Boulder's Go version setting in .travis.yml
 before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq mysql-server-5.6 mysql-client-5.6 mysql-client-core-5.6
   - 'dpkg -s libaugeas0'
   - '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || eval "$(gimme 1.5.1)"'
 
@@ -25,7 +24,6 @@ env:
     - TOXENV=py27 BOULDER_INTEGRATION=1
     - TOXENV=py26-oldest BOULDER_INTEGRATION=1
     - TOXENV=py27-oldest BOULDER_INTEGRATION=1
-    - TOXENV=le_auto
     - TOXENV=py33
     - TOXENV=py34
     - TOXENV=lint
@@ -47,13 +45,14 @@ branches:
     - master
     - /^test-.*$/
 
-sudo: required
-dist: trusty
+# container-based infrastructure
+sudo: false
 
 addons:
   # make sure simplehttp simple verification works (custom /etc/hosts)
   hosts:
     - le.wtf
+  mariadb: "10.0"
   apt:
     sources:
     - augeas