commit 3423b0cfbf96fd186d234fc4c3fc8ce4a2bf31c7
author Petr Michalec <pmichalec@mirantis.com> Fri Feb 16 15:07:31 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Fri Feb 16 15:07:31 2018 +0000
tree c2a881cec1a0ee0f10177404e7631fbb703c420a
parent 9434a4c20a24e0fe8c8a0b8e19ae22aa6600dad2
parent a5f5f67771f3a4350c27e04ffd5e1394c467bd7c

Merge "Use new image for kitchen tests"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 6f32d1d..1bde53b 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -34,9 +34,9 @@
   sudo: true
 
 platforms:
-  - name: <%= ENV['PLATFORM'] || 'ubuntu-xenial' %>
+  - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
     driver_config:
-      image: <%= ENV['PLATFORM'] || 'trevorj/salty-whales:xenial' %>
+      image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
       platform: ubuntu
 
 suites:

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 03a7f7b..b1c87d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,14 +17,17 @@
   - bundle install
 
 env:
-  - PLATFORM=trevorj/salty-whales:xenial
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=dogtag
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=dogtag
+#  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=dogtag
 
 before_script:
   - set -o pipefail
   - make test | tail
 
 script:
-  - test ! -e .kitchen.yml || bundle exec kitchen test -t tests/integration
+  - test ! -e .kitchen.yml || bundle exec kitchen converge ${SUITE} || true
+  - test ! -e .kitchen.yml || bundle exec kitchen verify ${SUITE} -t tests/integration
 
 notifications:
   webhooks: