From 9a5964722439ef45062461605443863f447de815 Mon Sep 17 00:00:00 2001
From: Liam Marshall <archimedespi3141@gmail.com>
Date: Wed, 4 Nov 2015 19:41:48 -0600
Subject: [PATCH 1/3] Enable builds on beta Trusty infrastructure

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8586c3840..0e5ea05ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,10 @@ branches:
     - master
     - /^test-.*$/
 
-sudo: false  # containers
+# enable Trusty beta on travis 
+sudo: required
+dist: trusty
+
 addons:
   # make sure simplehttp simple verification works (custom /etc/hosts)
   hosts:

From 94f0139c4d1b16bf79c96917acea65106f6ec5d6 Mon Sep 17 00:00:00 2001
From: Liam Marshall <archimedespi3141@gmail.com>
Date: Wed, 4 Nov 2015 19:59:27 -0600
Subject: [PATCH 2/3] install mysql with apt

Hack to try to get mysql to install nicely
---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0e5ea05ee..4696d18f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,6 +56,12 @@ addons:
     - openssl
     # For Boulder integration testing
     - rsyslog
+    - mysql
+
+
+before_install:
+  - sudo apt-get update
+  - sudo apt-get install -y mysql-client-core-5.6 mysql-server-5.6 mysql-client-5.6
 
 install: "travis_retry pip install tox coveralls"
 before_script: '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/boulder-start.sh'

From 731dc212a53a49a4a2092d054ef3ce7321dfb947 Mon Sep 17 00:00:00 2001
From: Liam Marshall <archimedespi3141@gmail.com>
Date: Wed, 4 Nov 2015 20:23:11 -0600
Subject: [PATCH 3/3] Try an indirect fix (suggested by @pde)

This is a squash of several commits:

`sudo apt-get`

Add -y to apt-get install
---
 .travis.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4696d18f4..86a0d3e7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,11 +2,11 @@ language: python
 
 services:
   - rabbitmq
-  - mysql
 
 # 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 install -y mariadb-server mariadb-server-10.0
   - '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || eval "$(gimme 1.5.1)"'
 
 # using separate envs with different TOXENVs creates 4x1 Travis build
@@ -56,12 +56,6 @@ addons:
     - openssl
     # For Boulder integration testing
     - rsyslog
-    - mysql
-
-
-before_install:
-  - sudo apt-get update
-  - sudo apt-get install -y mysql-client-core-5.6 mysql-server-5.6 mysql-client-5.6
 
 install: "travis_retry pip install tox coveralls"
 before_script: '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/boulder-start.sh'