From 10749097e61d49b55bf00d771d5126a4986b4907 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 28 Aug 2017 12:16:04 -0700
Subject: [PATCH] fs017: run tempest like fs006

Run tempest on scenario002-container like we already do on the classic
job.
It's patch on the ongoing efforts to run Tempest in our gate.

Change-Id: I40df97477182c6aee6391ae3244877ae26574456
---
 config/general_config/featureset017.yml | 52 ++++++++++++++++++++++---
 doc/source/feature-configuration.rst    |  2 +-
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/config/general_config/featureset017.yml b/config/general_config/featureset017.yml
index 39294f356..1e8788a61 100644
--- a/config/general_config/featureset017.yml
+++ b/config/general_config/featureset017.yml
@@ -11,12 +11,6 @@ undercloud_generate_service_certificate: false
 
 ssl_overcloud: false
 
-tempest_config: false
-# TODO(emilien)
-# We're figuring out why Zaqar doesn't work but pingtest should
-# be enabled soon.
-test_ping: false
-run_tempest: false
 step_introspect: false
 
 deploy_composable_scenario: true
@@ -64,3 +58,49 @@ 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:
+  # Testing zaqar doesn't work yet, but it's in progress
+  # - 'zaqar.tests.tempest_plugin.tests.v2.test_queues.TestManageQueue'
+  # Testing boot from volume and server connectivity
+  - 'tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern'
+  # Testing swift
+  - 'tempest.api.object_storage.test_object_services.ObjectTest'
+  # Testing cinder volumes encrypted by barbican:
+  - 'tempest.scenario.test_encrypted_cinder_volumes.TestEncryptedCinderVolumes'
+  # TODO(emilien) run autoscaling tests when telemetry works in python-tempestconf
+  # - 'ceilometer.tests.tempest.scenario.test_telemetry_integration.TestTelemetryIntegration'
+  # TODO(emilien) run ec2api tests when ec2api is supported in python-tempestconf
+  # - 'ec2api.tests.functional.api.test_key_pairs.KeyPairTest'
+tempest_plugins:
+  - python-aodh-tests
+  - python-ceilometer-tests
+  - python-gnocchi-tests
+  - python-barbican-tests-tempest
+  - python-zaqar-tests
+  - python-ec2-api-tests
diff --git a/doc/source/feature-configuration.rst b/doc/source/feature-configuration.rst
index ee65b2378..415835937 100644
--- a/doc/source/feature-configuration.rst
+++ b/doc/source/feature-configuration.rst
@@ -53,7 +53,7 @@ please consult the following `etherpad <https://etherpad.openstack.org/p/quickst
 +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
 | 016 |      |        |        |       |       |         |         |         |         | X       |          |             | X    |         | X     |       |       |       |       |       |       |       | X      |      |    |    |
 +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
-| 017 |      |        |        |       |       |         |         |         |         | X       |          |             |      |         |       | X     |       |       |       |       |       |       | X      |      |    |    |
+| 017 |      |        |        |       |       |         |         |         |         | X       |          |             |      | X       |       | X     |       |       |       |       |       |       | X      |      |    |    |
 +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
 | 018 |      |        |        |       |       |         |         |         |         | X       |          |             | X    |         |       |       | X     |       |       |       |       |       | X      |      |    |    |
 +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+