Drop Travis CI support
- Update links
Fixes: PROD-25037 (PROD:25037)
Fixes: PROD-25327 (PROD:25327)
Change-Id: Idaad239228e4036ad77ab822a8901bd0f4145a88
diff --git a/.kitchen.yml b/.kitchen.yml
index 277fded..2e6b8d6 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -30,90 +30,104 @@
- 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/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'%>
+
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
+
+ - name: xenial-stable
+ driver_config:
+ image: *xenial-stable
platform: ubuntu
suites:
-
- - name: agent_cluster
+<% for os_version in ['ocata','pike'] %>
+ - 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
pillars:
release.sls:
ceilometer:
server:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
ssl.sls:
ceilometer:
server:
@@ -131,15 +145,16 @@
- 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
pillars:
release.sls:
ceilometer:
server:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
ssl.sls:
ceilometer:
server:
@@ -157,15 +172,16 @@
- 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
pillars:
release.sls:
ceilometer:
agent:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
ssl.sls:
ceilometer:
agent:
@@ -182,5 +198,6 @@
- ceilometer
- release
- ssl
+<% end %>
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125