Skip state/module tests cinderv3, glancev2 for Mitaka, Newton
Cinderv3 on mitaka, newton v3 endpoint is absent
glancev2 on mitaka, newton BUG (PROD:22022)
Change-Id: If447281cf177b6c9a230f19c53a028bee9f9ada0
Related-Prod: PROD-21767 (PROD:21767)
diff --git a/runtest/salttest/modules/openstack/glancev2.sls b/runtest/salttest/modules/openstack/glancev2.sls
index 3a53605..c00348e 100644
--- a/runtest/salttest/modules/openstack/glancev2.sls
+++ b/runtest/salttest/modules/openstack/glancev2.sls
@@ -1,3 +1,4 @@
+{%- if pillar.get('runtest',{}).get('openstack_version') not in ('stable/mitaka', 'stable/newton') -%}
{%- set image_name = 'TestImage' %}
{%- set image_properties = "[{'op':'add', 'path':'/test_property', 'value': 'test'},]" %}
glancev2_image_create:
@@ -55,3 +56,5 @@
cloud_name: admin_identity
- require:
- glancev2_image_delete
+
+{%- endif -%}
diff --git a/runtest/salttest/states/openstack/cinderv3.sls b/runtest/salttest/states/openstack/cinderv3.sls
index 96b403f..c725a29 100644
--- a/runtest/salttest/states/openstack/cinderv3.sls
+++ b/runtest/salttest/states/openstack/cinderv3.sls
@@ -1,3 +1,4 @@
+{%- if pillar.get('runtest',{}).get('openstack_version') not in ('stable/mitaka', 'stable/newton') -%}
{%- set volume_type_name = 'TestVolumeType' %}
cinderv3_volume_type_present:
@@ -16,3 +17,5 @@
cinderv3.volume_type_absent:
- name: {{ volume_type_name }}
- cloud_name: admin_identity
+
+{%- endif -%}
diff --git a/runtest/salttest/states/openstack/glancev2.sls b/runtest/salttest/states/openstack/glancev2.sls
index cfe8c99..fb6f83e 100644
--- a/runtest/salttest/states/openstack/glancev2.sls
+++ b/runtest/salttest/states/openstack/glancev2.sls
@@ -1,3 +1,4 @@
+{%- if pillar.get('runtest',{}).get('openstack_version') not in ('stable/mitaka', 'stable/newton') -%}
{%- set glance_location = 'https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img' %}
{%- set glance_properties = '{"container_format": "bare", "disk_format": "raw", "protected": false, "tags": ["tags1", "tags2"], "visibility": "public"}' %}
glance_image_present:
@@ -13,3 +14,5 @@
- name: TestImage
- require:
- glance_image_present
+
+{%- endif -%}