diff --git a/config/general_config/featureset001.yml b/config/general_config/featureset001.yml index 4739f349b..496b3d08f 100644 --- a/config/general_config/featureset001.yml +++ b/config/general_config/featureset001.yml @@ -94,6 +94,8 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-validate + - "{% if run_tempest -%}tempest-setup{%- endif -%}" + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt table_of_contents: @@ -107,6 +109,8 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-validate + - "{% if run_tempest -%}tempest-setup{%- endif -%}" + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" # Use the traditional ping test in newton, ocata and pike # Run tempest in queens+ diff --git a/config/general_config/featureset002.yml b/config/general_config/featureset002.yml index 7af51de07..27ed00804 100644 --- a/config/general_config/featureset002.yml +++ b/config/general_config/featureset002.yml @@ -52,6 +52,8 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-validate - overcloud-delete + - "{% if run_tempest -%}tempest-setup{%- endif -%}" + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt table_of_contents: @@ -66,6 +68,8 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-validate - overcloud-delete + - "{% if run_tempest -%}tempest-setup{%- endif -%}" + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" # Use the traditional ping test in newton, ocata and pike # Run tempest in queens+ diff --git a/config/general_config/featureset016.yml b/config/general_config/featureset016.yml index eb7682d0a..8a69a195f 100644 --- a/config/general_config/featureset016.yml +++ b/config/general_config/featureset016.yml @@ -58,6 +58,8 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-upgrade - overcloud-validate + - "{% if run_tempest -%}tempest-setup{%- endif -%}" + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt table_of_contents: @@ -72,6 +74,8 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-upgrade - overcloud-validate + - "{% if run_tempest -%}tempest-setup{%- endif -%}" + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" composable_roles: true overcloud_roles: - name: Controller diff --git a/config/general_config/featureset017.yml b/config/general_config/featureset017.yml index 07cc7f031..3aed550ab 100644 --- a/config/general_config/featureset017.yml +++ b/config/general_config/featureset017.yml @@ -55,6 +55,8 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-upgrade + - "{% if run_tempest -%}tempest-setup{%- endif -%}" + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" - overcloud-validate included_static_docs: - env-setup-virt @@ -70,6 +72,8 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-upgrade - overcloud-validate + - "{% if run_tempest -%}tempest-setup{%- endif -%}" + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" composable_roles: true overcloud_roles: - name: Controller diff --git a/config/general_config/featureset018.yml b/config/general_config/featureset018.yml index 2011ac428..0ba598c8c 100644 --- a/config/general_config/featureset018.yml +++ b/config/general_config/featureset018.yml @@ -56,6 +56,8 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-upgrade - overcloud-validate + - "{% if run_tempest -%}tempest-setup{%- endif -%}" + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt table_of_contents: @@ -70,6 +72,8 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-upgrade - overcloud-validate + - "{% if run_tempest -%}tempest-setup{%- endif -%}" + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" composable_roles: true overcloud_roles: - name: Controller diff --git a/config/general_config/featureset019.yml b/config/general_config/featureset019.yml index 7c4bd1b1f..01a1f8c6e 100644 --- a/config/general_config/featureset019.yml +++ b/config/general_config/featureset019.yml @@ -55,6 +55,8 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-upgrade + - "{% if run_tempest -%}tempest-setup{%- endif -%}" + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" - overcloud-validate included_static_docs: - env-setup-virt @@ -70,6 +72,8 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-upgrade - overcloud-validate + - "{% if run_tempest -%}tempest-setup{%- endif -%}" + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" composable_roles: true overcloud_roles: - name: Controller diff --git a/config/general_config/featureset020.yml b/config/general_config/featureset020.yml index 1497f0bde..26629edb9 100644 --- a/config/general_config/featureset020.yml +++ b/config/general_config/featureset020.yml @@ -50,6 +50,8 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-validate + - tempest-setup + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt table_of_contents: @@ -63,6 +65,8 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-validate + - tempest-setup + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" deploy_steps_ansible_workflow: >- {% if release not in ['newton','ocata','pike','queens'] -%} diff --git a/config/general_config/featureset021.yml b/config/general_config/featureset021.yml index 671bf55c7..255efa125 100644 --- a/config/general_config/featureset021.yml +++ b/config/general_config/featureset021.yml @@ -36,6 +36,8 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-validate + - tempest-setup + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt table_of_contents: @@ -48,3 +50,5 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-validate + - tempest-setup + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" diff --git a/config/general_config/featureset027.yml b/config/general_config/featureset027.yml index 812128fb5..94577f3ed 100644 --- a/config/general_config/featureset027.yml +++ b/config/general_config/featureset027.yml @@ -77,6 +77,9 @@ artcl_create_docs_payload: - overcloud-prep-flavors - overcloud-prep-images - overcloud-prep-network + - tempest-setup + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" + included_static_docs: - env-setup-virt table_of_contents: @@ -87,3 +90,5 @@ artcl_create_docs_payload: - overcloud-prep-flavors - overcloud-prep-images - overcloud-prep-network + - tempest-setup + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" diff --git a/config/general_config/featureset035.yml b/config/general_config/featureset035.yml index fbb2d419d..6407e1170 100644 --- a/config/general_config/featureset035.yml +++ b/config/general_config/featureset035.yml @@ -46,6 +46,8 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-validate + - tempest-setup + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt table_of_contents: @@ -59,6 +61,8 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-validate + - tempest-setup + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" test_ping: false run_tempest: true diff --git a/config/general_config/featureset042.yml b/config/general_config/featureset042.yml index 13f0d169f..4f0d48f10 100644 --- a/config/general_config/featureset042.yml +++ b/config/general_config/featureset042.yml @@ -46,6 +46,8 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-validate + - tempest-setup + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt table_of_contents: @@ -59,6 +61,8 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-validate + - tempest-setup + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" test_ping: false run_tempest: true diff --git a/config/general_config/featureset048.yml b/config/general_config/featureset048.yml index 7edb80ecf..0492dcd3d 100644 --- a/config/general_config/featureset048.yml +++ b/config/general_config/featureset048.yml @@ -52,6 +52,8 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-validate + - tempest-setup + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt table_of_contents: @@ -65,3 +67,5 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-validate + - tempest-setup + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" diff --git a/config/general_config/minimal.yml b/config/general_config/minimal.yml index f1c61919b..fe073e693 100644 --- a/config/general_config/minimal.yml +++ b/config/general_config/minimal.yml @@ -54,6 +54,8 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-validate + - tempest-setup + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt table_of_contents: @@ -67,6 +69,8 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-validate + - tempest-setup + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" # Use the traditional ping test in newton, ocata and pike # Run tempest in queens+ diff --git a/config/general_config/pacemaker.yml b/config/general_config/pacemaker.yml index d8f135776..7477a1b56 100644 --- a/config/general_config/pacemaker.yml +++ b/config/general_config/pacemaker.yml @@ -54,6 +54,8 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-validate + - "{% if run_tempest -%}tempest-setup{%- endif -%}" + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt table_of_contents: @@ -67,6 +69,8 @@ artcl_create_docs_payload: - overcloud-deploy - overcloud-deploy-post - overcloud-validate + - "{% if run_tempest -%}tempest-setup{%- endif -%}" + - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" # Use the traditional ping test in newton, ocata and pike # Run tempest in queens+