From a20c2b1185b930d79209f9c80350b396ed8f3116 Mon Sep 17 00:00:00 2001
From: Marios Andreou <marios@redhat.com>
Date: Fri, 27 Mar 2020 13:17:03 +0200
Subject: [PATCH] Move featureset039 to os-tempest conditionally adds required
 vars

As in the other featuresets we need to add some os-tempest related
values. We want to move to os-tempest and away from legacy validate
tempest, especially for centos8 fs39. Tracked by tripleo-ci squad
in [1].

[1] https://hackmd.io/7MBqFHurTA2e5H8kYRwgag#Reviews-still-in-play-to-addmove-jobs

Change-Id: Ib0ba26b0d73613d859a474f3953c18feeb9952d2
---
 config/general_config/featureset039.yml | 50 ++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/config/general_config/featureset039.yml b/config/general_config/featureset039.yml
index 663f36667..e8bc6abdf 100644
--- a/config/general_config/featureset039.yml
+++ b/config/general_config/featureset039.yml
@@ -130,16 +130,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', 'train'] -%}
   false
   {%- else -%}
   true
   {%- endif -%}
+use_os_tempest: >-
+  {% if release not in ['pike', 'queens', 'rocky', 'stein', 'train'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+# It will create a public network name 'public' using os_tempest
+tempest_interface_name: public
+
+tempest_run_concurrency: 4
+
+# 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({}) }}"
 
 test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
+
+tempest_test_whitelist: "{{ tempest_whitelist }}"
+
 tempest_format: >-
   {% if containerized_undercloud|bool -%}
   container