commit 6f0e44bcd7c1c8f135e9df3bf64b41476277032d
author Petr Michalec <epcim@apealive.net> Mon Feb 19 12:38:33 2018 +0100
committer GitHub <noreply@github.com> Mon Feb 19 12:38:33 2018 +0100
tree 2adf857e43821dffee8989125f5fd9be185fae3c
parent bd2280d89110e9dc36436adbe27a3ee94cc74a55
parent 3bbd92ed4b3e48b3fc75fc0c8a30dd9599fd5d2e

Merge pull request #8 from Martin819/master

Use new image for kitchen tests

"b/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml"

diff --git "a/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml" "b/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml"
index 2f3725c..5d4ebed 100644
--- "a/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml"
+++ "b/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml"
@@ -31,9 +31,10 @@
 
 
 platforms:
-  - name: ubuntu-14.04
-  - name: ubuntu-16.04
-  - name: centos-7.1
+  - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
+    driver_config:
+      image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
+      platform: ubuntu
 
 
 verifier:

"b/\173\173cookiecutter.service_name\175\175/.travis.yml"

diff --git "a/\173\173cookiecutter.service_name\175\175/.travis.yml" "b/\173\173cookiecutter.service_name\175\175/.travis.yml"
index 872714a..abc6b38 100644
--- "a/\173\173cookiecutter.service_name\175\175/.travis.yml"
+++ "b/\173\173cookiecutter.service_name\175\175/.travis.yml"
@@ -22,8 +22,9 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:xenial
-    - PLATFORM=trevorj/salty-whales:bionic
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7
 
 before_script:
   - set -o pipefail