From 49a299deb0ef33c4d1079f949364438f4936cdcc Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 31 Aug 2017 21:53:27 -0700
Subject: [PATCH] run tempest on fs018 (scenario003-container)

Run tempest on fs018 (scenario003-container).

Change-Id: Ib90ae61cc4181c88179c4f015f0b45529c3c57fa
---
 config/general_config/featureset018.yml | 36 ++++++++++++++++++++++---
 doc/source/feature-configuration.rst    |  2 +-
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/config/general_config/featureset018.yml b/config/general_config/featureset018.yml
index 9c55a9f68..d8844b760 100644
--- a/config/general_config/featureset018.yml
+++ b/config/general_config/featureset018.yml
@@ -11,9 +11,6 @@ undercloud_generate_service_certificate: false
 
 ssl_overcloud: false
 
-tempest_config: false
-test_ping: true
-run_tempest: false
 step_introspect: false
 
 deploy_composable_scenario: true
@@ -61,3 +58,36 @@ overcloud_roles:
       - Storage
       - StorageMgmt
       - Tenant
+
+# Use the traditional ping test in newton and ocata
+# Run tempest in pike+
+
+test_ping: >-
+  {% if release in ['newton', 'ocata'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+
+tempest_config: >-
+  {% if release in ['newton', 'ocata'] -%}
+  false
+  {%- else -%}
+  true
+  {%- endif -%}
+
+run_tempest: >-
+  {% if release in ['newton', 'ocata'] -%}
+  false
+  {%- else -%}
+  true
+  {%- endif -%}
+
+test_regex: ''
+tempest_whitelist:
+  - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
+  - 'sahara_tempest_plugin.tests.api.test_data_sources.DataSourceTest'
+  - 'mistral_tempest_tests.tests.api.v2.test_actions.ActionTestsV2'
+tempest_plugins:
+  - python-sahara-tests
+  - python-mistral-tests
diff --git a/doc/source/feature-configuration.rst b/doc/source/feature-configuration.rst
index 78eaf686d..fd342b526 100644
--- a/doc/source/feature-configuration.rst
+++ b/doc/source/feature-configuration.rst
@@ -55,7 +55,7 @@ please consult the following `etherpad <https://etherpad.openstack.org/p/quickst
 +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
 | 017 |      |        |        |       |       |         |         |         |         | X       |          |             |      | X       |       | X     |       |       |       |       |       |       | X      |      |    |    |
 +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
-| 018 |      |        |        |       |       |         |         |         |         | X       |          |             | X    |         |       |       | X     |       |       |       |       |       | X      |      |    |    |
+| 018 |      |        |        |       |       |         |         |         |         | X       |          |             |      | X       |       |       | X     |       |       |       |       |       | X      |      |    |    |
 +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
 | 019 |      |        |        |       |       |         |         |         |         | X       |          |             |      |         |       |       |       | X     |       |       |       |       | X      |      |    |    |
 +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+