commit 8f8ee2576cd7f332aefcc85190ce3e2af33d5bca
author Petr Michalec <pmichalec@mirantis.com> Thu May 17 13:13:52 2018 +0000
committer Gerrit Code Review <gerrit2@15508502dd39> Thu May 17 13:13:52 2018 +0000
tree 3049e9c87191c6657cce77986611c9051961647e
parent a01a0b0ea4e8ca178adada906385fa875a92b5f6
parent a289cf86232dad86414c6cc553e3aa2676758d2e

Merge "Add Salt 2018.3 tests"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index fff8258..f4aa4cc 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -37,7 +37,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 ebd5938..28d8ddc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,12 +17,16 @@
   - bundle install
 
 env:
-  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=openssh-client
-  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=openssh-server
-  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=openssh-client
-  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=openssh-server
-  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=openssh-client
-  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=openssh-server
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=openssh-client
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=openssh-server
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=openssh-client
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=openssh-server
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=openssh-client
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=openssh-server
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=openssh-client
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=openssh-server
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=openssh-client
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=openssh-server
 
 before_script:
   - set -o pipefail