From 71bb645f0e0afc1a3575d2d0dd332b3f38af76f5 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sun, 1 Nov 2015 13:28:12 -0500
Subject: [PATCH 1/2] Enable usage of the Trusty beta on Travis

Travis now has new Trusty based instances in Beta. They offer much
faster boot times, twice as much memory, and a more reliable core count.
---
 .travis.yml          | 39 +++++++++++++++++++++++++--------------
 .travis/install_salt |  6 +++---
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1828eb4c..58f0d04f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,22 +3,33 @@
 language: cpp
 
 # NOTE: Make sure the matrix covers all node types in top.sls
+# sudo: required and dist: trusty enable usage of Trusty
 matrix:
   include:
-    - os: linux
-      env: SALT_NODE_ID=servo-master
-    - os: linux
-      env: SALT_NODE_ID=servo-linux1
-    - os: osx
-      env: SALT_NODE_ID=servo-mac1
-    - os: osx
-      env: SALT_NODE_ID=servo-macpro1
-    - os: linux
-      env: SALT_NODE_ID=linux1
-    - os: linux
-      env: SALT_NODE_ID=servo-linux-android1
-    - os: linux
-      env: SALT_NODE_ID=servo-head
+    - env: SALT_NODE_ID=servo-master
+      os: linux
+      sudo: required
+      dist: trusty
+    - env: SALT_NODE_ID=servo-linux1
+      os: linux
+      sudo: required
+      dist: trusty
+    - env: SALT_NODE_ID=servo-mac1
+      os: osx
+    - env: SALT_NODE_ID=servo-macpro1
+      os: osx
+    - env: SALT_NODE_ID=linux1
+      os: linux
+      sudo: required
+      dist: trusty
+    - env: SALT_NODE_ID=servo-linux-android1
+      os: linux
+      sudo: required
+      dist: trusty
+    - env: SALT_NODE_ID=servo-head
+      os: linux
+      sudo: required
+      dist: trusty
 
 before_install:
   - .travis/install_salt
diff --git a/.travis/install_salt b/.travis/install_salt
index 9f5bcda6..951fe7ba 100755
--- a/.travis/install_salt
+++ b/.travis/install_salt
@@ -4,9 +4,9 @@
 
 if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
   printf "$0: installing salt for Linux\n"
-  # Travis uses Ubuntu 12.04 (Precise Pangolin)
-  wget -O - https://repo.saltstack.com/apt/ubuntu/ubuntu12/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
-  printf 'deb http://repo.saltstack.com/apt/ubuntu/ubuntu12/2015.5 precise main\n' | sudo tee -a /etc/apt/sources.list >/dev/null
+  # Use Trusty (Ubuntu 14.04) on Travis
+  wget -O - https://repo.saltstack.com/apt/ubuntu/ubuntu14/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
+  printf 'deb http://repo.saltstack.com/apt/ubuntu/ubuntu14/2015.5 trusty main\n' | sudo tee -a /etc/apt/sources.list >/dev/null
   sudo apt-get -y update
   sudo apt-get -y install salt-minion=2015.5.6+ds-1
 elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then

From a2d4f50aca75e7fe856e88cd40fb48efc8efac48 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sun, 1 Nov 2015 13:37:30 -0500
Subject: [PATCH 2/2] Use curl instead of wget to avoid cert issues

wget throws cert errors when attempting to download the SaltStack repo
GPG key from repo.saltstack.com, even though ca-certificates is
up-to-date.
---
 .travis/install_salt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/install_salt b/.travis/install_salt
index 951fe7ba..1f185058 100755
--- a/.travis/install_salt
+++ b/.travis/install_salt
@@ -5,7 +5,7 @@
 if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
   printf "$0: installing salt for Linux\n"
   # Use Trusty (Ubuntu 14.04) on Travis
-  wget -O - https://repo.saltstack.com/apt/ubuntu/ubuntu14/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
+  curl https://repo.saltstack.com/apt/ubuntu/ubuntu14/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
   printf 'deb http://repo.saltstack.com/apt/ubuntu/ubuntu14/2015.5 trusty main\n' | sudo tee -a /etc/apt/sources.list >/dev/null
   sudo apt-get -y update
   sudo apt-get -y install salt-minion=2015.5.6+ds-1