Formulas testing revision 2019/10
Related: PROD-32744
Related: PROD-33633
Related: PROD-33634
Related: PROD-33698
Related: PROD-33984
Change-Id: I4df59cb4129e679038ff405cae5a1977e1a033ff
diff --git a/.kitchen.yml b/.kitchen.yml
index 042c12e..65e5643 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -18,9 +18,11 @@
- name: linux
repo: git
source: https://gerrit.mcp.mirantis.com/salt-formulas/linux
+ branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
- name: oslo_templates
repo: git
source: https://gerrit.mcp.mirantis.com/salt-formulas/oslo-templates
+ branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
state_top:
base:
"*":
@@ -33,99 +35,99 @@
- linux_repo_openstack
- ceilometer
- release
- pillars-from-files:
- linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%= ENV['OS_VERSION'] || 'pike' %>.sls
verifier:
name: inspec
sudo: true
+docker_images:
+ - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/mirantis/drivetrain/salt-formulas-ci/salt-formulas-ci-xenial-2017.7:latest'%>
+
platforms:
- - name: <%=ENV['PLATFORM'] || 'saltstack-ubuntu-xenial-salt-stable' %>
+ - name: xenial-2017.7
driver_config:
- image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
+ image: *xenial-20177
platform: ubuntu
suites:
-
- - name: agent_cluster
+<% for os_version in ['pike', 'queens'] %>
+ - name: agent_cluster_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/agent_cluster.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
release.sls:
ceilometer:
agent:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
- - name: agent_single
+ - name: agent_single_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/agent_single.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
release.sls:
ceilometer:
agent:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
- - name: agent_single_odl
+ - name: agent_single_odl_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/agent_single_odl.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
release.sls:
ceilometer:
agent:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
- - name: server_cluster
+ - name: server_cluster_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/server_cluster.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
release.sls:
ceilometer:
server:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
- - name: server_gnocchi_cluster
+ - name: server_gnocchi_cluster_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/server_gnocchi_cluster.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
release.sls:
ceilometer:
server:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
- - name: server_single
+ - name: server_single_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/server_single.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
release.sls:
ceilometer:
server:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
- - name: server_cluster_ssl
+ - name: server_cluster_ssl_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/server_cluster.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ ssl.sls: tests/pillar/_ssl_server.sls
pillars:
release.sls:
ceilometer:
server:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
- ssl.sls:
- ceilometer:
- server:
- identity:
- protocol: https
- message_queue:
- port: 5671
- ssl:
- enabled: True
+ version: <%=os_version%>
top.sls:
base:
"*":
@@ -134,24 +136,17 @@
- release
- ssl
- - name: server_gnocchi_cluster_ssl
+ - name: server_gnocchi_cluster_ssl_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/server_gnocchi_cluster.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ ssl.sls: tests/pillar/_ssl_server.sls
pillars:
release.sls:
ceilometer:
server:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
- ssl.sls:
- ceilometer:
- server:
- identity:
- protocol: https
- message_queue:
- port: 5671
- ssl:
- enabled: True
+ version: <%=os_version%>
top.sls:
base:
"*":
@@ -160,24 +155,17 @@
- release
- ssl
- - name: agent_cluster_ssl
+ - name: agent_cluster_ssl_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/agent_cluster.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ ssl.sls: tests/pillar/_ssl_agent.sls
pillars:
release.sls:
ceilometer:
agent:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
- ssl.sls:
- ceilometer:
- agent:
- identity:
- protocol: https
- message_queue:
- port: 5671
- ssl:
- enabled: True
+ version: <%=os_version%>
top.sls:
base:
"*":
@@ -185,5 +173,6 @@
- ceilometer
- release
- ssl
+<% end %>
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125