From 77137f7716eb301849aedd86418c81e96cb2adbb Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sat, 5 Sep 2015 17:17:25 +0000
Subject: [PATCH 1/4] Travis containers (fixes #617)

---
 .travis.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b4a9d3220..020e5b53d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,11 +27,23 @@ env:
     - TOXENV=lint
     - TOXENV=cover
 
-# make sure simplehttp simple verification works (custom /etc/hosts)
+sudo: false  # containers
 addons:
+  # make sure simplehttp simple verification works (custom /etc/hosts)
   hosts:
     - le.wtf
   mariadb: "10.0"
+  packages:  # keep in sync with bootstrap/ubuntu.sh and Boulder
+    - lsb-release
+    - python
+    - python-dev
+    - python-virtualenv
+    - gcc
+    - dialog
+    - libaugeas0
+    - libssl-dev
+    - libffi-dev
+    - ca-certificates
 
 install: "travis_retry pip install tox coveralls"
 before_script: '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/boulder-start.sh'

From 1c04abfe942d98ce398727673b3c122973716cdd Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sat, 5 Sep 2015 17:20:26 +0000
Subject: [PATCH 2/4] Travis: no sudo, install nginx and openssl.

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

diff --git a/.travis.yml b/.travis.yml
index 020e5b53d..a238109f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,6 @@ services:
 # 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:
-  - travis_retry sudo ./bootstrap/ubuntu.sh
-  - travis_retry sudo apt-get install --no-install-recommends nginx-light openssl
   - '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || eval "$(gimme 1.5)"'
 
 # using separate envs with different TOXENVs creates 4x1 Travis build
@@ -44,6 +42,8 @@ addons:
     - libssl-dev
     - libffi-dev
     - ca-certificates
+    - nginx-light
+    - openssl
 
 install: "travis_retry pip install tox coveralls"
 before_script: '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/boulder-start.sh'

From f5c9f92c4284fee16b86fa375e3db9f8bab303e2 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sat, 5 Sep 2015 17:23:38 +0000
Subject: [PATCH 3/4] Travis: addons.(apt.)packages

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a238109f5..db5614e5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,8 @@ addons:
   hosts:
     - le.wtf
   mariadb: "10.0"
-  packages:  # keep in sync with bootstrap/ubuntu.sh and Boulder
+  apt:
+    packages:  # keep in sync with bootstrap/ubuntu.sh and Boulder
     - lsb-release
     - python
     - python-dev

From 86bfe61ea3e2e4a020d331e6ca120701768b1b7d Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sat, 5 Sep 2015 21:50:14 +0000
Subject: [PATCH 4/4] Travis: add rsyslog

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index db5614e5c..b24ecfa7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,8 +43,11 @@ addons:
     - libssl-dev
     - libffi-dev
     - ca-certificates
+    # For letsencrypt-nginx integration testing
     - nginx-light
     - openssl
+    # For Boulder integration testing
+    - rsyslog
 
 install: "travis_retry pip install tox coveralls"
 before_script: '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/boulder-start.sh'