From a40813e388bdfb2a84742a7693a87ba2989e1e4e Mon Sep 17 00:00:00 2001
From: "Chandan Kumar (raukadah)" <chkumar@redhat.com>
Date: Tue, 30 Jul 2019 10:32:12 +0530
Subject: [PATCH] Adapt os_tempest in FS001

Since os_tempest ansible role is the defacto standard for
running tempest in TripleO in the favor of validate-tempest.

It modifies the FS001 to run os_tempest on master release and
validate-tempest on older release.

https://tree.taiga.io/project/tripleo-ci-board/task/1204

Change-Id: Icb49b2baa4835463995c952a35c231698a795f6b
Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
Co-Authored-by: Arx Cruz <arxcruz@gmail.com>
---
 config/general_config/featureset001.yml | 54 ++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/config/general_config/featureset001.yml b/config/general_config/featureset001.yml
index fc145a148..c34670dc2 100644
--- a/config/general_config/featureset001.yml
+++ b/config/general_config/featureset001.yml
@@ -132,13 +132,64 @@ test_ping: >-
   false
   {%- endif -%}
 
+# Settings for os_tempest
 run_tempest: >-
-  {% if release in ['newton', 'ocata', 'pike'] -%}
+  {% if release not in ['pike', 'queens', 'rocky', 'stein'] -%}
   false
   {%- else -%}
   true
   {%- endif -%}
 
+use_os_tempest: >-
+  {% if release not in ['pike', 'queens', 'rocky', 'stein'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+
+tempest_test_whitelist:
+  - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
+
+# It will create a public network name 'public' using os_tempest
+tempest_interface_name: public
+
+# In order to have a public network with external connectivity, we need to use
+# flat network type
+tempest_public_net_provider_type: flat
+
+# It is the physical network name through which public network will be created
+# having connectivity with external world.
+tempest_public_net_physical_name: datacentre
+
+# Setting the tempest_cidr as it is required while creating public subnet from which
+# floating IPs gets assigned
+tempest_cidr: '10.0.0.0/24'
+
+# In order to create a private network, fs01 is based on OVN, geneve should be used
+# as private network type
+tempest_private_net_provider_type: geneve
+
+tempest_private_net_seg_id: ''
+
+tempest_install_method: distro
+
+# Having tempest_network_ping_gateway set to true allows to ping any of the IP from
+# router to find out network related issue in the deployment early
+tempest_network_ping_gateway: true
+
+# It is the python-tempestconf profile which also consumes tempest-deployer-input file
+tempest_tempestconf_profile:
+  debug: true
+  create: true
+  deployer-input: "{{ ansible_user_dir }}/tempest-deployer-input.conf"
+  os-cloud: "{{ tempest_cloud_name }}"
+  out: "{{ tempest_workspace }}/etc/tempest.conf"
+  network-id: "{{ tempest_neutron_public_network_id }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default('omit') }}"
+
+tempest_tempest_conf_overrides:
+  auth.use_dynamic_credentials: 'True'
+
 test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
@@ -155,4 +206,5 @@ undercloud_enable_tempest: >-
   false
   {%- endif -%}
 
+
 tempest_extra_config: {'compute_feature_enabled.config_drive': 'True'}