From 9defbc3aed018816cbe9a4a9165750d48d30be9f Mon Sep 17 00:00:00 2001
From: ohemorange <ebportnoy@gmail.com>
Date: Thu, 29 Mar 2018 17:18:15 -0700
Subject: [PATCH] Add before_install to all tests running on test-everything
 (#5806)

* add before_install to all tests running on test-everything

* actually always run before_install

* also don't override addons

* only install libaugeas0 for docker_dev
---
 .travis.yml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b8f70696b..6767164c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,38 +44,28 @@ matrix:
     - sudo: required
       env: TOXENV=apache_compat
       services: docker
-      before_install:
-      addons:
     - sudo: required
       env: TOXENV=nginx_compat
       services: docker
-      before_install:
-      addons:
     - sudo: required
       env: TOXENV=le_auto_precise
       services: docker
-      before_install:
-      addons:
     - sudo: required
       env: TOXENV=le_auto_trusty
       services: docker
-      before_install:
-      addons:
     - sudo: required
       env: TOXENV=le_auto_wheezy
       services: docker
-      before_install:
-      addons:
     - sudo: required
       env: TOXENV=le_auto_centos6
       services: docker
-      before_install:
-      addons:
     - sudo: required
       env: TOXENV=docker_dev
       services: docker
-      before_install:
       addons:
+        apt:
+          packages:  # don't install nginx and apache
+          - libaugeas0
     - python: "2.7"
       env: TOXENV=apacheconftest
       sudo: required