Formulas testing revision 2019/10
Related: PROD-32744
Related: PROD-33633
Related: PROD-33698
Change-Id: I4815844b7a5e2d356ee3d7f5e06caa02652663b2
diff --git a/.kitchen.yml b/.kitchen.yml
index f9f9386..816a77d 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -41,8 +41,7 @@
sudo: true
docker_images:
- - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19'%>
- - &xenial-stable <%=ENV['IMAGE_XENIAL_STABLE'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+ - &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: xenial-2017.7
@@ -50,13 +49,8 @@
image: *xenial-20177
platform: ubuntu
- - name: xenial-stable
- driver_config:
- image: *xenial-stable
- platform: ubuntu
-
suites:
-<% for os_version in ['ocata','pike'] %>
+<% for os_version in ['pike', 'queens', 'rocky'] %>
- name: agent_cluster_<%=os_version%>
provisioner:
pillars-from-files:
@@ -128,81 +122,57 @@
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: <%=os_version%>
- ssl.sls:
- ceilometer:
- server:
- identity:
- protocol: https
- message_queue:
- port: 5671
- ssl:
- enabled: True
top.sls:
base:
"*":
- linux_repo_openstack
- ceilometer
- - release
- ssl
+ - release
- 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: <%=os_version%>
- ssl.sls:
- ceilometer:
- server:
- identity:
- protocol: https
- message_queue:
- port: 5671
- ssl:
- enabled: True
top.sls:
base:
"*":
- linux_repo_openstack
- ceilometer
- - release
- ssl
+ - release
- 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: <%=os_version%>
- ssl.sls:
- ceilometer:
- agent:
- identity:
- protocol: https
- message_queue:
- port: 5671
- ssl:
- enabled: True
top.sls:
base:
"*":
- linux_repo_openstack
- ceilometer
- - release
- ssl
+ - release
<% end %>
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125