commit 331f53265f2d901b4d1c09c9f8be500c6583f396
author Petr Michalec <pmichalec@mirantis.com> Thu May 17 13:14:37 2018 +0000
committer Gerrit Code Review <gerrit2@15508502dd39> Thu May 17 13:14:38 2018 +0000
tree dae8b6a098d81bb58bf6bca84c11b5f3def6ca65
parent ad8648f61f4c7717399eeffc8395d18449fc6a49
parent b20ab4e91266531bbe9a4765684d0363eb66591e

Merge "Add Salt 2018.3 tests"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 29ac20f..497eecc 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -31,7 +31,7 @@
 platforms:
   - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
+      image: <%=ENV['PLATFORM'] || 'epcim/salt:saltstack-ubuntu-xenial-salt-stable'%>
       platform: ubuntu
 
 suites:

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 9e03750..b9ee103 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,11 @@
   - bundle install
 
 env:
-  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=iptables-server
-  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=iptables-server
-#  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=iptables-server
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=iptables-server
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=iptables-server
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=iptables-server
+#  - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=iptables-server
+#  - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=iptables-server
 
 before_script:
   - set -o pipefail