Update .kitchen and .travis files to use proper suites
Fixes: PROD-25177 (PROD:25177)
Change-Id: I4f58e2f7a0dcab12c8ac242ec830b07ff39146ea
diff --git "a/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml" "b/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml"
index 703312e..8495bd9 100644
--- "a/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml"
+++ "b/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml"
@@ -5,8 +5,6 @@
#socket: tcp://127.0.0.1:2376
use_sudo: false
-
-
provisioner:
name: salt_solo
salt_install: bootstrap
@@ -29,32 +27,34 @@
{%- if cookiecutter.kitchen_driver =='docker' %}
-
platforms:
- - name: <%=ENV['PLATFORM'] || 'saltstack-ubuntu-xenial-salt-stable' %>
+ - name: xenial-stable
driver_config:
- image: <%=ENV['PLATFORM'] || 'epcim/salt:saltstack-ubuntu-xenial-salt-stable'%>
+ image: docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19
platform: ubuntu
+ - name: xenial-2017.7
+ driver_config:
+ image: docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19
+ platform: ubuntu
verifier:
name: {{ cookiecutter.kitchen_verifier }}
sudo: true
-
suites:
{%- if cookiecutter.kitchen_suites == "" %}
- - name: default
- # provisioner:
- # pillars-from-files:
- # {{ cookiecutter.kitchen_formula }}.sls: tests/pillar/default.sls
+ - name: {{ cookiecutter.role_name }}-single
+ provisioner:
+ pillars-from-files:
+ {{ cookiecutter.kitchen_formula }}.sls: tests/pillar/{{ cookiecutter.role_name }}_single.sls
{%- else %}
{%- for suite in cookiecutter.kitchen_suites.split() %}
- name: {{ suite }}
provisioner:
pillars-from-files:
- {{ cookiecutter.kitchen_formula }}.sls: tests/pillar/{{suite}}.sls
+ {{ cookiecutter.kitchen_formula }}.sls: tests/pillar/{{ suite }}.sls
{%- endfor %}
{%- endif %}