commit df130a0c8e6d7b257cbf2a170ff050cc0d386e66
author Petr Michalec <pmichalec@mirantis.com> Thu May 17 13:14:57 2018 +0000
committer Gerrit Code Review <gerrit2@15508502dd39> Thu May 17 13:14:58 2018 +0000
tree 241bc2a19531e7a7ea6ae0ab51346a2d90ad8e76
parent b65c0d2f3dfc207a086e000e0cd8159542688663
parent 82c3e2210cffba40e099446f6a0f1f491d496dba

Merge "Add Salt 2018.3 tests"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 35a2afd..b2395a4 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -32,7 +32,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 696d53f..2735f98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,11 +17,13 @@
   - bundle install
 
 env:
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-trusty-salt-2017.7 SUITE=apache-server-php5
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-trusty-salt-2016.3 SUITE=apache-server-php5
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=apache-server-php7
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=apache-server-php7
-#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=apache-server-php7
+    - PLATFORM=epcim/salt:saltstack-ubuntu-trusty-salt-2016.3 SUITE=apache-server-php5
+    - PLATFORM=epcim/salt:saltstack-ubuntu-trusty-salt-2017.7 SUITE=apache-server-php5
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=apache-server-php7
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=apache-server-php7
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=apache-server-php7
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=apache-server-php7
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=apache-server-php7
 
 before_script:
   - set -o pipefail