From 7ee23b723af6b7cb62f23f2bfdc2e472d80f89ec Mon Sep 17 00:00:00 2001
From: Erik Rose <erik@mozilla.com>
Date: Tue, 12 Jan 2016 11:35:58 -0500
Subject: [PATCH] Get all tests, even le_auto, working on Travis.

Switch to a MySQL 5.6 setup based on https://github.com/mozilla/treeherder/pull/1080/files and Travis's beta trusty infra, which runs on Google Compute Engine.

Remove MariaDB addon, which conflicts with the socket used by the treeherder approach's mysql package. Remove maria service (which has no effect).
---
 .travis.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d9b4cb5ea..ab81f20b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,13 +2,14 @@ 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)"'
 
@@ -24,6 +25,7 @@ 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
@@ -45,14 +47,13 @@ branches:
     - master
     - /^test-.*$/
 
-# container-based infrastructure
-sudo: false
+sudo: required
+dist: trusty
 
 addons:
   # make sure simplehttp simple verification works (custom /etc/hosts)
   hosts:
     - le.wtf
-  mariadb: "10.0"
   apt:
     sources:
     - augeas