Formulas testing revision 2019/10
Related: PROD-32744
Related: PROD-33633
Related: PROD-33698
Change-Id: Ibb00597d4827af02c6329e51f52ca4b2903bd69b
diff --git a/.kitchen.yml b/.kitchen.yml
index 47966af..45eeeb4 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -44,8 +44,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
@@ -53,13 +52,8 @@
image: *xenial-20177
platform: ubuntu
- - name: xenial-stable
- driver_config:
- image: *xenial-stable
- platform: ubuntu
-
suites:
-<% for os_version in ['ocata','pike','queens','rocky'] %>
+<% for os_version in ['pike','queens','rocky'] %>
- name: compute_dpdk_<%=os_version%>
provisioner:
pillars-from-files:
@@ -160,22 +154,6 @@
compute:
version: <%=os_version%>
-<% if os_version != 'ocata' %>
- # Disabled for now, will be fixed and tracked in https://mirantis.jira.com/browse/PROD-27380
- # - name: compute_bgpvpn_<%=os_version%>
- # provisioner:
- # pillars-from-files:
- # compute_legacy.sls: tests/pillar/compute_legacy.sls
- # neutron.sls: tests/pillar/compute_bgpvpn.sls
- # linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
- # pillars:
- # release.sls:
- # neutron:
- # compute:
- # version: <%=os_version%>
-
-<% end %>
-
- name: control_cluster_<%=os_version%>
provisioner:
pillars-from-files:
@@ -305,20 +283,6 @@
compute:
version: <%=os_version%>
-<% if os_version != 'ocata' %>
- # Temporarily deisable bgpvpn tests until it's fixed. More info in https://mirantis.jira.com/browse/PROD-27380
- # - name: control_bgpvpn_<%=os_version%>
- # provisioner:
- # pillars-from-files:
- # control_nodvr.sls: tests/pillar/control_nodvr.sls
- # neutron.sls: tests/pillar/control_bgpvpn.sls
- # linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
- # pillars:
- # release.sls:
- # neutron:
- # compute:
- # version: <%=os_version%>
-
- name: control_sfc_<%=os_version%>
provisioner:
pillars-from-files:
@@ -331,8 +295,6 @@
compute:
version: <%=os_version%>
-<% end %>
-
- name: gateway_dvr_<%=os_version%>
provisioner:
pillars-from-files: