commit 0268a872e7fe013507485d461ecea86e636ac3f4
author Petr Michalec <pmichalec@mirantis.com> Thu May 17 13:15:18 2018 +0000
committer Gerrit Code Review <gerrit2@15508502dd39> Thu May 17 13:15:18 2018 +0000
tree 8558f956c7afe654066e72d10c27e0e63b42ec93
parent cb2bb079d620be369318cef0e05cdfa38697498e
parent d137f30190df3e3a259a55335e46c9a1020c1916

Merge "Add Salt 2018.3 tests"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 57d452e..e775ef2 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -61,7 +61,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 00108fc..61dbf39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,18 +17,26 @@
   - bundle install
 
 env:
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
-#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
-#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
-#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
-#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
 
 before_script:
   - set -o pipefail