Add Aodh configs for rocky and update kitchen
Change-Id: Ieca4a1f16aa3715554cba4f953b1d85bda123c16
Related-Prod: PROD-23721 (PROD:23721)
diff --git a/.kitchen.yml b/.kitchen.yml
index 1d34f62..a1a7ae9 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -21,6 +21,9 @@
- name: apache
repo: git
source: https://gerrit.mcp.mirantis.com/salt-formulas/apache
+ - name: oslo_templates
+ repo: git
+ source: https://gerrit.mcp.mirantis.com/salt-formulas/oslo-templates
state_top:
base:
"*":
@@ -88,59 +91,36 @@
platform: ubuntu
suites:
-
- - name: server_cluster_ocata
+<% for os_version in ['ocata','pike','queens','rocky'] %>
+ - name: server_cluster_<%=os_version%>
provisioner:
pillars:
release.sls:
aodh:
server:
- version: ocata
+ version: <%=os_version%>
pillars-from-files:
aodh.sls: tests/pillar/server_cluster.sls
- linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_ocata.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
- - name: server_cluster_pike
+ - name: server_single_<%=os_version%>
provisioner:
pillars:
release.sls:
aodh:
server:
- version: pike
- pillars-from-files:
- aodh.sls: tests/pillar/server_cluster.sls
- linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
-
- - name: server_single_ocata
- provisioner:
- pillars:
- release.sls:
- aodh:
- server:
- version: ocata
+ version: <%=os_version%>
pillars-from-files:
aodh.sls: tests/pillar/server_single.sls
- linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_ocata.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
- - name: server_single_pike
+ - name: server_cluster_ssl_<%=os_version%>
provisioner:
pillars:
release.sls:
aodh:
server:
- version: pike
- pillars-from-files:
- aodh.sls: tests/pillar/server_single.sls
- linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
-
-
- - name: server_cluster_ssl_pike
- provisioner:
- pillars:
- release.sls:
- aodh:
- server:
- version: pike
+ version: <%=os_version%>
top.sls:
base:
"*":
@@ -150,15 +130,15 @@
- ssl
pillars-from-files:
aodh.sls: tests/pillar/server_cluster.sls
- linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
- - name: server_single_ssl_pike
+ - name: server_single_ssl_<%=os_version%>
provisioner:
pillars:
release.sls:
aodh:
server:
- version: pike
+ version: <%=os_version%>
top.sls:
base:
"*":
@@ -168,6 +148,6 @@
- ssl
pillars-from-files:
aodh.sls: tests/pillar/server_single.sls
- linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
-
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+<% end %>
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125