commit 8c058ace4fa3da62ee73d588ef5d22b42f0b078b
author Martin Polreich <polreichmartin@gmail.com> Thu Jun 21 14:21:34 2018 +0200
committer GitHub <noreply@github.com> Thu Jun 21 14:21:34 2018 +0200
tree 26d627f538b8fc75cd5842d6a53e91aa7cbfa43f
parent 42c7857b8c810f07a86c62df47beb8792e0a3fc0
parent dc02dcb13d21a6a0f6530e67f5dda12de59de075

Merge branch 'master' into master

.kitchen.travis.yml

diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
new file mode 100644
index 0000000..f847543
--- /dev/null
+++ b/.kitchen.travis.yml
@@ -0,0 +1,6 @@
+suites:
+
+  - name: <%= ENV['SUITE'] %>
+    provisioner:
+      pillars-from-files:
+        neutron.sls: tests/pillar/<%= ENV['SUITE'] %>.sls

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 2d0633e..31b7e26 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -83,6 +83,7 @@
     - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=gateway-legacy-fwaas-v1
     - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=gateway-legacy-fwaas-v1
 #   - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=gateway-legacy-fwaas-v1
+
 before_script:
   - set -o pipefail
   - make test | tail