From 7c7713c3d789b800d65d804647d4b972db0332a9 Mon Sep 17 00:00:00 2001
From: "Chandan Kumar (raukadah)" <chkumar@redhat.com>
Date: Wed, 9 Oct 2019 12:08:47 +0530
Subject: [PATCH] Move fs020 to os_tempest from train onwards

It is getting tested here:
https://review.rdoproject.org/r/#/c/23034/

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

Depends-On: https://review.opendev.org/#/c/689106/

Change-Id: Id56735b698fa70626847806db793d51458c36b4b
Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
---
 config/general_config/featureset020.yml | 70 ++++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 1 deletion(-)

diff --git a/config/general_config/featureset020.yml b/config/general_config/featureset020.yml
index 8a1c1188d..121ca5aa9 100644
--- a/config/general_config/featureset020.yml
+++ b/config/general_config/featureset020.yml
@@ -140,7 +140,6 @@ undercloud_enable_tempest: >-
   {%- else -%}
   false
   {%- endif -%}
-run_tempest: true
 test_white_regex: '.*'
 
 # Barbican plugin is here because python-tempestconf doesn't have support to
@@ -154,3 +153,72 @@ test_black_regex:
 test_ping: false
 # For full tempest run we need to make sure concurrency is not too high
 tempest_workers: 3
+
+# os_tempest setting
+# Settings for os_tempest
+run_tempest: >-
+  {% 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 -%}
+
+# 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, fs020 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') }}"
+
+# Running all api and scenario tests
+tempest_test_whitelist:
+  - 'tempest.api'
+  - 'tempest.scenario'
+  - 'keystone_tempest_plugin'
+  - 'neutron_tempest_plugin'
+  - 'cinder_tempest_plugin'
+
+# Set tempest concurrency
+tempest_run_concurrency: 3
+
+# List of tempest plugins to install
+tempest_services:
+  - cinder
+  - neutron