From ad0f465cd6451b4573fcb8e45e945b97301ac33f Mon Sep 17 00:00:00 2001
From: "Chandan Kumar (raukadah)" <chkumar@redhat.com>
Date: Wed, 3 Mar 2021 17:53:05 +0530
Subject: [PATCH] Remove undercloud_enable_tempest var

Since we are working in process of removing tempest container
from wallaby release and all the tempest run is switched to
os_tempest for all supported release in tripleo-ci.

This change is not going to affect any periodic jobs also.

It also removes run_tempest and tempest_format var.

Related-Bug: #1916875

Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
Change-Id: I3d046047833044fd2d75ba399f784be5d992fbef
---
 .../deprecated/composable_upgrade.yml         |  1 -
 .../deprecated/composable_upgrade_ovb.yml     |  1 -
 .../deprecated/featureset053.yml              | 22 ----------------
 config/general_config/deprecated/ipv6.yml     |  2 --
 .../deprecated/minimal_pacemaker.yml          |  1 -
 config/general_config/featureset001.yml       | 24 -----------------
 config/general_config/featureset002.yml       | 18 -------------
 config/general_config/featureset005.yml       | 15 -----------
 config/general_config/featureset006.yml       | 14 ----------
 config/general_config/featureset007.yml       | 15 -----------
 config/general_config/featureset008.yml       | 15 -----------
 config/general_config/featureset010.yml       | 22 ----------------
 config/general_config/featureset016.yml       | 25 ------------------
 config/general_config/featureset017.yml       | 25 ------------------
 config/general_config/featureset018.yml       | 25 ------------------
 config/general_config/featureset019.yml       | 25 ------------------
 config/general_config/featureset020.yml       | 21 ---------------
 config/general_config/featureset021.yml       | 22 ----------------
 config/general_config/featureset022.yml       |  2 --
 config/general_config/featureset026.yml       |  2 --
 config/general_config/featureset027.yml       | 20 --------------
 config/general_config/featureset028.yml       |  7 -----
 config/general_config/featureset030.yml       | 21 ---------------
 config/general_config/featureset031.yml       | 15 -----------
 config/general_config/featureset032.yml       | 15 -----------
 config/general_config/featureset033.yml       |  9 -------
 config/general_config/featureset035.yml       | 26 -------------------
 config/general_config/featureset038.yml       | 20 --------------
 config/general_config/featureset039.yml       | 23 ----------------
 config/general_config/featureset040.yml       |  6 -----
 config/general_config/featureset041.yml       | 17 ------------
 config/general_config/featureset042.yml       |  9 -------
 config/general_config/featureset043.yml       | 23 ----------------
 config/general_config/featureset048.yml       | 10 -------
 config/general_config/featureset052.yml       |  9 -------
 config/general_config/featureset054.yml       |  3 ---
 config/general_config/featureset055.yml       |  8 ------
 config/general_config/featureset056.yml       |  9 -------
 config/general_config/featureset058.yml       |  2 --
 config/general_config/featureset060.yml       |  2 --
 config/general_config/featureset061.yml       |  9 -------
 config/general_config/featureset063.yml       | 11 --------
 config/general_config/featureset099.yml       |  1 -
 config/general_config/minimal.yml             | 22 ----------------
 config/general_config/pacemaker.yml           | 11 --------
 45 files changed, 605 deletions(-)

diff --git a/config/general_config/deprecated/composable_upgrade.yml b/config/general_config/deprecated/composable_upgrade.yml
index 25d13565e..cf26b4614 100644
--- a/config/general_config/deprecated/composable_upgrade.yml
+++ b/config/general_config/deprecated/composable_upgrade.yml
@@ -28,7 +28,6 @@ ssl_overcloud: false
 # If `test_tempest` is `true`, run tempests tests, otherwise do not
 # run them.
 test_ping: false
-run_tempest: false
 enable_pacemaker: false
 composable_scenario: multinode_major_upgrade.yaml
 upgrade_composable_scenario: multinode_major_upgrade.yaml
diff --git a/config/general_config/deprecated/composable_upgrade_ovb.yml b/config/general_config/deprecated/composable_upgrade_ovb.yml
index b4dd4bd99..cddb9e2f9 100644
--- a/config/general_config/deprecated/composable_upgrade_ovb.yml
+++ b/config/general_config/deprecated/composable_upgrade_ovb.yml
@@ -18,7 +18,6 @@ undercloud_generate_service_certificate: true
 # This enables the deployment of the overcloud with SSL.
 ssl_overcloud: false
 
-run_tempest: false
 test_ping: false
 
 # overcloud network config
diff --git a/config/general_config/deprecated/featureset053.yml b/config/general_config/deprecated/featureset053.yml
index 1ed0935f9..611a98745 100644
--- a/config/general_config/deprecated/featureset053.yml
+++ b/config/general_config/deprecated/featureset053.yml
@@ -117,28 +117,6 @@ test_ping: >-
   false
   {%- endif -%}
 
-
-run_tempest: >-
-  {% if release in ['newton', 'ocata', 'pike'] -%}
-  false
-  {%- else -%}
-  true
-  {%- endif -%}
-
-undercloud_enable_tempest: >-
-  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
-
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-
 test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
diff --git a/config/general_config/deprecated/ipv6.yml b/config/general_config/deprecated/ipv6.yml
index 2aa23adc6..392154c00 100644
--- a/config/general_config/deprecated/ipv6.yml
+++ b/config/general_config/deprecated/ipv6.yml
@@ -12,8 +12,6 @@ extra_args: ''
 test_ping: true
 enable_pacemaker: true
 
-run_tempest: false
-
 artcl_gen_docs: true
 artcl_create_docs_payload:
   included_deployment_scripts:
diff --git a/config/general_config/deprecated/minimal_pacemaker.yml b/config/general_config/deprecated/minimal_pacemaker.yml
index 4136d241a..82b9bd3a7 100644
--- a/config/general_config/deprecated/minimal_pacemaker.yml
+++ b/config/general_config/deprecated/minimal_pacemaker.yml
@@ -29,7 +29,6 @@ enable_pacemaker: true
 
 test_ping: false
 tempest_config: true
-run_tempest: true
 tempest_workers: 4
 test_white_regex: smoke|test_minimum_basic|test_network_basic_ops|test_snapshot_pattern|test_volume_boot_pattern
 
diff --git a/config/general_config/featureset001.yml b/config/general_config/featureset001.yml
index 4b70fa070..6041f1f6b 100644
--- a/config/general_config/featureset001.yml
+++ b/config/general_config/featureset001.yml
@@ -96,8 +96,6 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
   included_static_docs:
     - env-setup-virt
   table_of_contents:
@@ -111,8 +109,6 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 
 deploy_steps_ansible_workflow: >-
   {% if release not in ['newton','ocata','pike'] -%}
@@ -138,13 +134,6 @@ test_ping: >-
   {%- endif -%}
 
 # 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
@@ -208,19 +197,6 @@ tempest_test_whitelist: >-
   {{ tempest_check_whitelist }}
   {%- endif -%}
 
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-undercloud_enable_tempest: >-
-  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
-
 tempest_run_concurrency: 4
 
 tempest_extra_config: {'compute_feature_enabled.config_drive': 'True'}
diff --git a/config/general_config/featureset002.yml b/config/general_config/featureset002.yml
index 417f255b0..8e2f69132 100644
--- a/config/general_config/featureset002.yml
+++ b/config/general_config/featureset002.yml
@@ -103,8 +103,6 @@ artcl_create_docs_payload:
     - overcloud-deploy-post
     - overcloud-validate
     - overcloud-delete
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
   included_static_docs:
     - env-setup-virt
   table_of_contents:
@@ -119,8 +117,6 @@ artcl_create_docs_payload:
     - overcloud-deploy-post
     - overcloud-validate
     - overcloud-delete
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 
 deploy_steps_ansible_workflow: >-
   {% if release not in ['newton','ocata','pike'] -%}
@@ -147,12 +143,6 @@ test_ping: >-
   {%- endif -%}
 
 # 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'] -%}
@@ -206,11 +196,3 @@ tempest_extra_config: {'compute_feature_enabled.config_drive': 'True'}
 test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
-
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
diff --git a/config/general_config/featureset005.yml b/config/general_config/featureset005.yml
index bf68a3bf1..2437f7586 100644
--- a/config/general_config/featureset005.yml
+++ b/config/general_config/featureset005.yml
@@ -34,14 +34,6 @@ tempest_whitelist_new:
   - 'tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern'
   - 'telemetry_tempest_plugin.scenario.test_telemetry_integration.TestTelemetryIntegration'
 
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-
 # Use the traditional ping test in newton and ocata
 # Run tempest in pike+
 
@@ -52,13 +44,6 @@ test_ping: >-
   false
   {%- endif -%}
 
-run_tempest: >-
-  {% if release in ['newton', 'ocata'] -%}
-  false
-  {%- else -%}
-  true
-  {%- endif -%}
-
 test_white_regex: ''
 
 
diff --git a/config/general_config/featureset006.yml b/config/general_config/featureset006.yml
index 4631879a0..059f5fa6c 100644
--- a/config/general_config/featureset006.yml
+++ b/config/general_config/featureset006.yml
@@ -39,20 +39,6 @@ test_ping: >-
   false
   {%- endif -%}
 
-run_tempest: >-
-  {% if release in ['newton', 'ocata'] -%}
-  false
-  {%- else -%}
-  true
-  {%- endif -%}
-
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
 
 test_white_regex: ''
 tempest_whitelist_old:
diff --git a/config/general_config/featureset007.yml b/config/general_config/featureset007.yml
index 45a158c31..f9c6cf006 100644
--- a/config/general_config/featureset007.yml
+++ b/config/general_config/featureset007.yml
@@ -39,21 +39,6 @@ test_ping: >-
   false
   {%- endif -%}
 
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-
-run_tempest: >-
-  {% if release in ['newton', 'ocata'] -%}
-  false
-  {%- else -%}
-  true
-  {%- endif -%}
-
 test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
diff --git a/config/general_config/featureset008.yml b/config/general_config/featureset008.yml
index 372552d45..233f91e79 100644
--- a/config/general_config/featureset008.yml
+++ b/config/general_config/featureset008.yml
@@ -39,21 +39,6 @@ test_ping: >-
   false
   {%- endif -%}
 
-run_tempest: >-
-  {% if release in ['newton', 'ocata'] -%}
-  false
-  {%- else -%}
-  true
-  {%- endif -%}
-
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-
 test_white_regex: ''
 tempest_whitelist_old:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
diff --git a/config/general_config/featureset010.yml b/config/general_config/featureset010.yml
index 5dbaa3490..93f5194e3 100644
--- a/config/general_config/featureset010.yml
+++ b/config/general_config/featureset010.yml
@@ -71,17 +71,9 @@ config_download_args: >-
   {%- endif -%}
 
 # Tempest configuration, keep always at the end of the file
-# If `run_tempest` is `true`, run tempests tests, otherwise do not
-# run them.
 test_ping: false
 
 # 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'] -%}
@@ -95,20 +87,6 @@ tempest_test_whitelist:
 
 test_white_regex: 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
 
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-undercloud_enable_tempest: >-
-  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
-
 # https://launchpad.net/bugs/1844446
 undercloud_enable_validations: false
 
diff --git a/config/general_config/featureset016.yml b/config/general_config/featureset016.yml
index 479f5ad1b..084775fb9 100644
--- a/config/general_config/featureset016.yml
+++ b/config/general_config/featureset016.yml
@@ -31,12 +31,6 @@ undercloud_templates_path: /usr/share/openstack-tripleo-heat-templates
 undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
 undercloud_cloud_domain: "localdomain"
 undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
-undercloud_enable_tempest: >-
-  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
 
 # options below direct automatic doc generation by tripleo-collect-logs
 artcl_gen_docs: true
@@ -52,8 +46,6 @@ artcl_create_docs_payload:
     - overcloud-deploy-post
     - overcloud-upgrade
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
   included_static_docs:
     - env-setup-virt
   table_of_contents:
@@ -68,8 +60,6 @@ artcl_create_docs_payload:
     - overcloud-deploy-post
     - overcloud-upgrade
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 composable_roles: true
 overcloud_roles:
   - name: Controller
@@ -114,23 +104,8 @@ test_ping: >-
   false
   {%- endif -%}
 
-run_tempest: >-
-  {% if release in ['newton', 'ocata'] -%}
-  false
-  {%- else -%}
-  true
-  {%- endif -%}
-
 test_white_regex: ''
 
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-
 tempest_whitelist_old:
   - 'tempest.api.identity.v3'
   - 'tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern'
diff --git a/config/general_config/featureset017.yml b/config/general_config/featureset017.yml
index d20fb6dcf..fd7f5d270 100644
--- a/config/general_config/featureset017.yml
+++ b/config/general_config/featureset017.yml
@@ -27,12 +27,6 @@ undercloud_templates_path: /usr/share/openstack-tripleo-heat-templates
 undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
 undercloud_cloud_domain: "localdomain"
 undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
-undercloud_enable_tempest: >-
-  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
 
 # options below direct automatic doc generation by tripleo-collect-logs
 artcl_gen_docs: true
@@ -47,8 +41,6 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-upgrade
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
     - overcloud-validate
   included_static_docs:
     - env-setup-virt
@@ -64,8 +56,6 @@ artcl_create_docs_payload:
     - overcloud-deploy-post
     - overcloud-upgrade
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 composable_roles: true
 overcloud_roles:
   - name: Controller
@@ -115,23 +105,8 @@ test_ping: >-
   false
   {%- endif -%}
 
-run_tempest: >-
-  {% if release in ['newton', 'ocata'] -%}
-  false
-  {%- else -%}
-  true
-  {%- endif -%}
-
 test_white_regex: ''
 
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-
 # TODO(emilien) run ec2api tests when ec2api is supported in python-tempestconf
 # 'ec2api.tests.functional.api.test_key_pairs.KeyPairTest'
 tempest_whitelist_new:
diff --git a/config/general_config/featureset018.yml b/config/general_config/featureset018.yml
index 901ee9f23..80e22771d 100644
--- a/config/general_config/featureset018.yml
+++ b/config/general_config/featureset018.yml
@@ -29,12 +29,6 @@ undercloud_templates_path: /usr/share/openstack-tripleo-heat-templates
 undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
 undercloud_cloud_domain: "localdomain"
 undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
-undercloud_enable_tempest: >-
-  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
 
 # options below direct automatic doc generation by tripleo-collect-logs
 artcl_gen_docs: true
@@ -50,8 +44,6 @@ artcl_create_docs_payload:
     - overcloud-deploy-post
     - overcloud-upgrade
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
   included_static_docs:
     - env-setup-virt
   table_of_contents:
@@ -66,8 +58,6 @@ artcl_create_docs_payload:
     - overcloud-deploy-post
     - overcloud-upgrade
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 composable_roles: true
 overcloud_roles:
   - name: Controller
@@ -117,23 +107,8 @@ test_ping: >-
   false
   {%- endif -%}
 
-run_tempest: >-
-  {% if release in ['newton', 'ocata'] -%}
-  false
-  {%- else -%}
-  true
-  {%- endif -%}
-
 test_white_regex: ''
 
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
   - 'sahara_tempest_plugin.tests.api.test_data_sources.DataSourceTest'
diff --git a/config/general_config/featureset019.yml b/config/general_config/featureset019.yml
index bad6b15d7..83dce5b0c 100644
--- a/config/general_config/featureset019.yml
+++ b/config/general_config/featureset019.yml
@@ -43,8 +43,6 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-upgrade
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
     - overcloud-validate
   included_static_docs:
     - env-setup-virt
@@ -60,8 +58,6 @@ artcl_create_docs_payload:
     - overcloud-deploy-post
     - overcloud-upgrade
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 composable_roles: true
 overcloud_roles:
   - name: Controller
@@ -98,12 +94,6 @@ config_download_args: >-
 # Tempest configuration, keep always at the end of the file
 # Use the traditional ping test in newton and ocata
 # Run tempest in pike+
-undercloud_enable_tempest: >-
-  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
 
 test_ping: >-
   {% if release in ['newton', 'ocata'] -%}
@@ -112,23 +102,8 @@ test_ping: >-
   false
   {%- endif -%}
 
-run_tempest: >-
-  {% if release in ['newton', 'ocata'] -%}
-  false
-  {%- else -%}
-  true
-  {%- endif -%}
-
 test_white_regex: ''
 
-# Run tempest in containers only when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-
 tempest_whitelist_old:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
 tempest_whitelist_new:
diff --git a/config/general_config/featureset020.yml b/config/general_config/featureset020.yml
index d0b3bd6a5..912757cf0 100644
--- a/config/general_config/featureset020.yml
+++ b/config/general_config/featureset020.yml
@@ -118,7 +118,6 @@ artcl_create_docs_payload:
     - overcloud-deploy-post
     - overcloud-validate
     - tempest-setup
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
   included_static_docs:
     - env-setup-virt
   table_of_contents:
@@ -133,7 +132,6 @@ artcl_create_docs_payload:
     - overcloud-deploy-post
     - overcloud-validate
     - tempest-setup
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 
 deploy_steps_ansible_workflow: >-
   {% if release not in ['newton','ocata','pike'] -%}
@@ -150,19 +148,6 @@ config_download_args: >-
 
 # Tempest configuration, keep always at the end of the file
 # Tempest
-# Run containerized tempest from master and ongoing
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-undercloud_enable_tempest: >-
-  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
 test_white_regex: '.*'
 
 # Barbican plugin is here because python-tempestconf doesn't have support to
@@ -179,12 +164,6 @@ 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'] -%}
diff --git a/config/general_config/featureset021.yml b/config/general_config/featureset021.yml
index 57bad91d4..78c532742 100644
--- a/config/general_config/featureset021.yml
+++ b/config/general_config/featureset021.yml
@@ -89,7 +89,6 @@ artcl_create_docs_payload:
     - overcloud-deploy-post
     - overcloud-validate
     - tempest-setup
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
   included_static_docs:
     - env-setup-virt
   table_of_contents:
@@ -104,7 +103,6 @@ artcl_create_docs_payload:
     - overcloud-deploy-post
     - overcloud-validate
     - tempest-setup
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 
 deploy_steps_ansible_workflow: >-
   {% if release not in ['newton','ocata','pike'] -%}
@@ -121,19 +119,6 @@ config_download_args: >-
 
 # Tempest configuration, keep always at the end of the file
 # Tempest
-# Run containerized tempest from master and ongoing
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-undercloud_enable_tempest: >-
-  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
 
 # Featureset 021 is a special case where we do not run full tempest
 # but just the tests on skiplist
@@ -177,13 +162,6 @@ tempest_workers: 3
 
 # Settings specific to os_tempest
 # 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
diff --git a/config/general_config/featureset022.yml b/config/general_config/featureset022.yml
index 99e6843b2..691611b16 100644
--- a/config/general_config/featureset022.yml
+++ b/config/general_config/featureset022.yml
@@ -18,8 +18,6 @@ telemetry_args: >-
 enable_pacemaker: false
 network_isolation: false
 overcloud_ipv6: false
-# If `run_tempest` is `true`, run tempests tests, otherwise do not
-# run them.
 test_ping: true
 use_os_tempest: false
 
diff --git a/config/general_config/featureset026.yml b/config/general_config/featureset026.yml
index a471e2c93..10a978a0c 100644
--- a/config/general_config/featureset026.yml
+++ b/config/general_config/featureset026.yml
@@ -36,8 +36,6 @@ config_download_args: >-
   --disable-validations
   --verbose
 
-# If `run_tempest` is `true`, run tempests tests, otherwise do not
-# run them.
 test_ping: false
 use_os_tempest: false
 composable_roles: true
diff --git a/config/general_config/featureset027.yml b/config/general_config/featureset027.yml
index 2351f1829..5f339ef99 100644
--- a/config/general_config/featureset027.yml
+++ b/config/general_config/featureset027.yml
@@ -51,7 +51,6 @@ artcl_create_docs_payload:
     - overcloud-prep-images
     - overcloud-prep-network
     - tempest-setup
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 
   included_static_docs:
     - env-setup-virt
@@ -64,19 +63,10 @@ artcl_create_docs_payload:
     - overcloud-prep-images
     - overcloud-prep-network
     - tempest-setup
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 
 # Tempest configuration, keep always at the end of the file
-# If `run_tempest` is `true`, run tempests tests, otherwise do not
-# run them.
 test_ping: false
 # os_tempest configuration
-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'] -%}
@@ -93,8 +83,6 @@ tempest_service_available_neutron: false
 tempest_test_whitelist: "{{ tempest_whitelist }}"
 tempest_test_blacklist: "{{ test_black_regex }}"
 test_regex: ''
-# Enable tempest container
-undercloud_enable_tempest: true
 
 # Run an undercloud without glance or nova
 undercloud_enable_nova: >-
@@ -104,14 +92,6 @@ undercloud_enable_nova: >-
   false
   {%- endif -%}
 
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-
 # Enable mistral tempest plugin
 tempest_service_available_mistral: >-
    {% if lookup('env', 'ZUUL_PROJECT') == "openstack/mistral" -%}
diff --git a/config/general_config/featureset028.yml b/config/general_config/featureset028.yml
index a0846b836..21efbaec9 100644
--- a/config/general_config/featureset028.yml
+++ b/config/general_config/featureset028.yml
@@ -42,13 +42,6 @@ overcloud_roles:
       - Tenant
 
 # Tempest configuration, keep always at the end of the file
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
 
 test_ping: false
 test_white_regex: ''
diff --git a/config/general_config/featureset030.yml b/config/general_config/featureset030.yml
index d93bd3392..5e28705ca 100644
--- a/config/general_config/featureset030.yml
+++ b/config/general_config/featureset030.yml
@@ -19,12 +19,6 @@ undercloud_templates_path: /usr/share/openstack-tripleo-heat-templates
 undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
 undercloud_cloud_domain: "localdomain"
 undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
-undercloud_enable_tempest: >-
-  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
 
 # This enables TLS for the undercloud which will also make haproxy bind to the
 # configured public-vip and admin-vip.
@@ -85,16 +79,7 @@ config_download_args: >-
 
 
 # Tempest configuration, keep always at the end of the file
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
 
-# If `run_tempest` is `true`, run tempests tests, otherwise do not
-# run them.
 tempest_config: true
 test_ping: false
 test_white_regex: ''
@@ -106,12 +91,6 @@ overcloud_container_cli: >-
 
 # 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'] -%}
diff --git a/config/general_config/featureset031.yml b/config/general_config/featureset031.yml
index c18a867f5..b067a6223 100644
--- a/config/general_config/featureset031.yml
+++ b/config/general_config/featureset031.yml
@@ -56,24 +56,9 @@ undercloud_templates_path: /usr/share/openstack-tripleo-heat-templates
 undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
 undercloud_cloud_domain: "localdomain"
 undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
-undercloud_enable_tempest: >-
-  {% if release not in ['ocata', 'pike', 'queens', 'rocky'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
 
 # Tempest configuration, keep always at the end of the file
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
 
-# If `run_tempest` is `true`, run tempests tests, otherwise do not
-# run them.
 test_ping: false
 test_white_regex: ''
 tempest_whitelist:
diff --git a/config/general_config/featureset032.yml b/config/general_config/featureset032.yml
index 6573075ae..e937ce832 100644
--- a/config/general_config/featureset032.yml
+++ b/config/general_config/featureset032.yml
@@ -57,21 +57,6 @@ undercloud_cloud_domain: "localdomain"
 undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
 
 # Tempest configuration, keep always at the end of the file
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
 
-# If `run_tempest` is `true`, run tempests tests, otherwise do not
-# run them.
 test_ping: false
 test_white_regex: 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
-undercloud_enable_tempest: >-
-  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
diff --git a/config/general_config/featureset033.yml b/config/general_config/featureset033.yml
index 9bfa32961..afb2bc348 100644
--- a/config/general_config/featureset033.yml
+++ b/config/general_config/featureset033.yml
@@ -95,16 +95,7 @@ overcloud_roles:
       - Tenant
 
 # Tempest configuration, keep always at the end of the file
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
 
-# If `run_tempest` is `true`, run tempests tests, otherwise do not
-# run them.
 tempest_config: false
 test_ping: false
 use_os_tempest: false
diff --git a/config/general_config/featureset035.yml b/config/general_config/featureset035.yml
index 77e36c449..fbf9b9c5f 100644
--- a/config/general_config/featureset035.yml
+++ b/config/general_config/featureset035.yml
@@ -94,8 +94,6 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
   included_static_docs:
     - env-setup-virt
   table_of_contents:
@@ -109,8 +107,6 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 
 deploy_steps_ansible_workflow: >-
   {% if release not in ['newton','ocata','pike'] -%}
@@ -127,15 +123,6 @@ config_download_args: >-
 
 # Tempest configuration, keep always at the end of the file
 test_ping: false
-
-# 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
@@ -203,19 +190,6 @@ tempest_test_whitelist: >-
   {{ tempest_check_whitelist }}
   {%- endif -%}
 
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-undercloud_enable_tempest: >-
-  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
-
 tempest_run_concurrency: 4
 
 # Run an undercloud without glance or nova
diff --git a/config/general_config/featureset038.yml b/config/general_config/featureset038.yml
index c9965bc06..fed6776ff 100644
--- a/config/general_config/featureset038.yml
+++ b/config/general_config/featureset038.yml
@@ -19,12 +19,6 @@ undercloud_templates_path: /usr/share/openstack-tripleo-heat-templates
 undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
 undercloud_cloud_domain: "localdomain"
 undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
-undercloud_enable_tempest: >-
-  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
 ctlplane_masquerade: >-
   {% if release not in ['newton','ocata','pike','queens'] -%}
   true
@@ -73,8 +67,6 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-upgrade
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
     - overcloud-validate
   included_static_docs:
     - env-setup-virt
@@ -90,8 +82,6 @@ artcl_create_docs_payload:
     - overcloud-deploy-post
     - overcloud-upgrade
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 
 deployed_server: >-
   {% if release in ['newton','ocata','pike','queens'] -%}
@@ -112,8 +102,6 @@ config_download_args: >-
   --verbose
   {%- endif -%}
 
-# Tempest configuration, keep always at the end of the file If `run_tempest` is
-# `true`, run tempests tests, otherwise do not run them. We also need to
 # selectively re-enable the globally blacklist octavia tempest plugin.
 skip_test_file: "{{ playbook_dir | dirname }}/vars/tempest_skip_{{ release | default('master') }}.yml"
 skip_list_tests: "{{ lookup('file', skip_test_file) | from_yaml }}"
@@ -124,14 +112,6 @@ test_black_regex: "{{ tempest_black }}"
 test_ping: false
 test_white_regex: ''
 
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-
 tempest_whitelist:
   - 'octavia_tempest_plugin.tests.scenario.v2.test_load_balancer.LoadBalancerScenarioTest'
 tempest_plugins:
diff --git a/config/general_config/featureset039.yml b/config/general_config/featureset039.yml
index c02b9acd9..5e329e6c0 100644
--- a/config/general_config/featureset039.yml
+++ b/config/general_config/featureset039.yml
@@ -87,8 +87,6 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
   included_static_docs:
     - env-setup-virt
   table_of_contents:
@@ -104,8 +102,6 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 
 deploy_steps_ansible_workflow: >-
   {% if release not in ['newton','ocata','pike'] -%}
@@ -131,12 +127,6 @@ test_ping: >-
   {%- endif -%}
 
 # Settings for os_tempest
-run_tempest: >-
-  {% 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
@@ -184,19 +174,6 @@ tempest_whitelist:
 
 tempest_test_whitelist: "{{ tempest_whitelist }}"
 
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-undercloud_enable_tempest: >-
-  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
-
 undercloud_enable_nova: true
 undercloud_enable_swift: true
 
diff --git a/config/general_config/featureset040.yml b/config/general_config/featureset040.yml
index 948f8ae07..ee1cc036b 100644
--- a/config/general_config/featureset040.yml
+++ b/config/general_config/featureset040.yml
@@ -108,9 +108,3 @@ undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
 # Tempest configuration, keep always at the end of the file
 test_ping: false
 # Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
diff --git a/config/general_config/featureset041.yml b/config/general_config/featureset041.yml
index ae19ff6e7..901aa73ab 100644
--- a/config/general_config/featureset041.yml
+++ b/config/general_config/featureset041.yml
@@ -89,8 +89,6 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
   included_static_docs:
     - env-setup-virt
   table_of_contents:
@@ -104,8 +102,6 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 
 deploy_steps_ansible_workflow: >-
   {% if release not in ['newton','ocata','pike'] -%}
@@ -130,22 +126,9 @@ test_ping: >-
   false
   {%- endif -%}
 
-run_tempest: >-
-  {% if release in ['newton', 'ocata', 'pike'] -%}
-  false
-  {%- else -%}
-  true
-  {%- endif -%}
-
 test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
 
 # Validate HA
 validate_ha_overcloud: true
diff --git a/config/general_config/featureset042.yml b/config/general_config/featureset042.yml
index 236ce22f3..101e8e21c 100644
--- a/config/general_config/featureset042.yml
+++ b/config/general_config/featureset042.yml
@@ -46,7 +46,6 @@ artcl_create_docs_payload:
     - overcloud-deploy-post
     - overcloud-validate
     - tempest-setup
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
   included_static_docs:
     - env-setup-virt
   table_of_contents:
@@ -61,19 +60,11 @@ artcl_create_docs_payload:
     - overcloud-deploy-post
     - overcloud-validate
     - tempest-setup
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 
 deploy_steps_ansible_workflow: true
 
 # Tempest configuration, keep always at the end of the file
 test_ping: false
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
 
 test_white_regex: ''
 tempest_whitelist:
diff --git a/config/general_config/featureset043.yml b/config/general_config/featureset043.yml
index af1806ae6..38492e172 100644
--- a/config/general_config/featureset043.yml
+++ b/config/general_config/featureset043.yml
@@ -87,8 +87,6 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
   included_static_docs:
     - env-setup-virt
   table_of_contents:
@@ -104,8 +102,6 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 
 deploy_steps_ansible_workflow: >-
   {% if release not in ['newton','ocata','pike'] -%}
@@ -130,28 +126,9 @@ test_ping: >-
   false
   {%- endif -%}
 
-run_tempest: >-
-  {% if release in ['newton', 'ocata', 'pike'] -%}
-  false
-  {%- else -%}
-  true
-  {%- endif -%}
-
 test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-undercloud_enable_tempest: >-
-  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
 
 # TLS everywhere related vars. #
 enable_tls_everywhere: true
diff --git a/config/general_config/featureset048.yml b/config/general_config/featureset048.yml
index dae00e1a3..95ce66c69 100644
--- a/config/general_config/featureset048.yml
+++ b/config/general_config/featureset048.yml
@@ -43,7 +43,6 @@ artcl_create_docs_payload:
     - overcloud-deploy-post
     - overcloud-validate
     - tempest-setup
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
   included_static_docs:
     - env-setup-virt
   table_of_contents:
@@ -58,17 +57,8 @@ artcl_create_docs_payload:
     - overcloud-deploy-post
     - overcloud-validate
     - tempest-setup
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 
 # Tempest configuration, keep always at the end of the file
-# Tempest
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
 
 test_regex: '.*'
 test_ping: false
diff --git a/config/general_config/featureset052.yml b/config/general_config/featureset052.yml
index e3f4aadd4..7fab757a6 100644
--- a/config/general_config/featureset052.yml
+++ b/config/general_config/featureset052.yml
@@ -21,8 +21,6 @@ standalone_custom_env_files:
 
 # validation
 
-# If `run_tempest` is `true`, run tempests tests, otherwise do not
-# run them.
 test_ping: false
 # Running only smoke tests and a few scenarios
 test_white_regex: '\[.*\bsmoke\b.*\]'
@@ -38,13 +36,6 @@ tempest_whitelist:
   - 'tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern'
 
 # 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
diff --git a/config/general_config/featureset054.yml b/config/general_config/featureset054.yml
index 5a51bb98f..421cdc73d 100644
--- a/config/general_config/featureset054.yml
+++ b/config/general_config/featureset054.yml
@@ -68,9 +68,6 @@ overcloud_roles:
 test_ping: >-
   false
 
-run_tempest: >-
-  true
-
 test_regex: ''
 tempest_whitelist:
   - 'ironic_tempest_plugin.tests.scenario.test_baremetal_multitenancy.BaremetalMultitenancy.test_baremetal_multitenancy'
diff --git a/config/general_config/featureset055.yml b/config/general_config/featureset055.yml
index b89e0d934..5c3e52b5b 100644
--- a/config/general_config/featureset055.yml
+++ b/config/general_config/featureset055.yml
@@ -70,15 +70,7 @@ test_ping: >-
   false
   {%- endif -%}
 
-run_tempest: >-
-  {% if release in ['newton', 'ocata'] -%}
-  false
-  {%- else -%}
-  true
-  {%- endif -%}
-
 test_white_regex: ''
-tempest_format: ''
 
 # Run RefStack tests
 tempest_run_refstack: true
diff --git a/config/general_config/featureset056.yml b/config/general_config/featureset056.yml
index 45487c476..ef3fa84ba 100644
--- a/config/general_config/featureset056.yml
+++ b/config/general_config/featureset056.yml
@@ -29,17 +29,8 @@ standalone_custom_env_files:
 standalone_upgrade: true
 # validation
 
-# If `run_tempest` is `true`, run tempests tests, otherwise do not
-# run them.
 test_ping: false
 
-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
diff --git a/config/general_config/featureset058.yml b/config/general_config/featureset058.yml
index 47f11f612..9164fd37b 100644
--- a/config/general_config/featureset058.yml
+++ b/config/general_config/featureset058.yml
@@ -14,8 +14,6 @@ standalone_role: Standalone.yaml
 standalone_update: true
 # validation
 
-# If `run_tempest` is `true`, run tempests tests, otherwise do not
-# run them.
 test_ping: false
 test_regex: ''
 # NOTE(aschultz): containers assume RC at the moment
diff --git a/config/general_config/featureset060.yml b/config/general_config/featureset060.yml
index 3bc00d7d5..c2a9ddd5a 100644
--- a/config/general_config/featureset060.yml
+++ b/config/general_config/featureset060.yml
@@ -22,8 +22,6 @@ standalone_custom_env_files:
 
 # validation
 
-# If `run_tempest` is `true`, run tempests tests, otherwise do not
-# run them.
 test_ping: false
 use_os_tempest: true
 # NOTE(aschultz): containers assume RC at the moment
diff --git a/config/general_config/featureset061.yml b/config/general_config/featureset061.yml
index 41f25191f..0c88b7279 100644
--- a/config/general_config/featureset061.yml
+++ b/config/general_config/featureset061.yml
@@ -45,7 +45,6 @@ artcl_create_docs_payload:
     - overcloud-prep-images
     - overcloud-prep-network
     - tempest-setup
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 
   included_static_docs:
     - env-setup-virt
@@ -58,18 +57,10 @@ artcl_create_docs_payload:
     - overcloud-prep-images
     - overcloud-prep-network
     - tempest-setup
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 
 # Tempest configuration, keep always at the end of the file
-# If `run_tempest` is `true`, run tempests tests, otherwise do not
-# run them.
 test_ping: false
 test_regex: ''
-# Enable tempest container
-undercloud_enable_tempest: true
-
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: container
 
 tempest_undercloud: true
 tempest_overcloud: false
diff --git a/config/general_config/featureset063.yml b/config/general_config/featureset063.yml
index 47f09d3cb..42bf42813 100644
--- a/config/general_config/featureset063.yml
+++ b/config/general_config/featureset063.yml
@@ -87,8 +87,6 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
   included_static_docs:
     - env-setup-virt
   table_of_contents:
@@ -102,8 +100,6 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 
 deploy_steps_ansible_workflow: >-
   {% if release not in ['newton','ocata','pike'] -%}
@@ -133,15 +129,8 @@ overcloud_cloud_name_ctlplane: "overcloud.ctlplane.{{ tripleo_domain }}"
 additional_cell: true
 
 # Tempest configuration, keep always at the end of the file
-# If `run_tempest` is `true`, run tempests tests, otherwise do not
-# run them.
 test_ping: false
 test_regex: ''
-# Enable tempest container
-undercloud_enable_tempest: true
-
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: container
 
 tempest_whitelist:
   - 'tempest.api.identity'
diff --git a/config/general_config/featureset099.yml b/config/general_config/featureset099.yml
index 93c25ecc5..138c3d22b 100644
--- a/config/general_config/featureset099.yml
+++ b/config/general_config/featureset099.yml
@@ -24,7 +24,6 @@ standalone_custom_env_files:
 # validation
 standalone_ansible_lint: true
 
-# If `run_tempest` is `true`, run tempests tests, otherwise do not
 # run them.
 test_ping: false
 # Running only smoke tests and a few scenarios
diff --git a/config/general_config/minimal.yml b/config/general_config/minimal.yml
index 865b12150..b8af62b80 100644
--- a/config/general_config/minimal.yml
+++ b/config/general_config/minimal.yml
@@ -141,29 +141,7 @@ test_ping: >-
   false
   {%- endif -%}
 
-# Run tempest in containers when at least undercloud is containerized
-tempest_format: >-
-  {% if containerized_undercloud|bool -%}
-  container
-  {%- else -%}
-  packages
-  {%- endif -%}
-
-undercloud_enable_tempest: >-
-  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
-
 # 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
diff --git a/config/general_config/pacemaker.yml b/config/general_config/pacemaker.yml
index 4657e4752..a7f23879d 100644
--- a/config/general_config/pacemaker.yml
+++ b/config/general_config/pacemaker.yml
@@ -53,8 +53,6 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
   included_static_docs:
     - env-setup-virt
   table_of_contents:
@@ -68,8 +66,6 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-    - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}"
-    - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}"
 
 # Use the traditional ping test in newton, ocata and pike
 # Run tempest in queens+
@@ -81,13 +77,6 @@ test_ping: >-
   false
   {%- endif -%}
 
-run_tempest: >-
-  {% if release in ['newton', 'ocata', 'pike'] -%}
-  false
-  {%- else -%}
-  true
-  {%- endif -%}
-
 test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'