From fb900349aaf30b50cbc26846c3ea68306062d9f5 Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Mon, 11 Jun 2018 11:23:42 +0300 Subject: [PATCH] Fix logs by setting defaults for tempest_format Bug was introduced in https://review.openstack.org/#/c/566527/ Set default value for tempest_format in logs collection role when it publishes docs. Closes-Bug: #1776164 Change-Id: I25a73bbd3804cf013f38627ca3d742e3a6a2f5d1 --- config/general_config/featureset001.yml | 8 ++++---- config/general_config/featureset002.yml | 8 ++++---- config/general_config/featureset016.yml | 8 ++++---- config/general_config/featureset017.yml | 8 ++++---- config/general_config/featureset018.yml | 8 ++++---- config/general_config/featureset019.yml | 8 ++++---- config/general_config/featureset020.yml | 4 ++-- config/general_config/featureset021.yml | 4 ++-- config/general_config/featureset027.yml | 4 ++-- config/general_config/featureset035.yml | 4 ++-- config/general_config/featureset042.yml | 4 ++-- config/general_config/featureset048.yml | 4 ++-- config/general_config/minimal.yml | 4 ++-- config/general_config/pacemaker.yml | 8 ++++---- 14 files changed, 42 insertions(+), 42 deletions(-) diff --git a/config/general_config/featureset001.yml b/config/general_config/featureset001.yml index 496b3d08f..6e3603c01 100644 --- a/config/general_config/featureset001.yml +++ b/config/general_config/featureset001.yml @@ -94,8 +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 -%}" + - "{% 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 +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 -%}" + - "{% 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+ diff --git a/config/general_config/featureset002.yml b/config/general_config/featureset002.yml index 27ed00804..ba8951991 100644 --- a/config/general_config/featureset002.yml +++ b/config/general_config/featureset002.yml @@ -52,8 +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 -%}" + - "{% 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 +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 -%}" + - "{% 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+ diff --git a/config/general_config/featureset016.yml b/config/general_config/featureset016.yml index 8a69a195f..943e19d05 100644 --- a/config/general_config/featureset016.yml +++ b/config/general_config/featureset016.yml @@ -58,8 +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 -%}" + - "{% 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: @@ -74,8 +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 -%}" + - "{% 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 diff --git a/config/general_config/featureset017.yml b/config/general_config/featureset017.yml index 3aed550ab..9c7035b9f 100644 --- a/config/general_config/featureset017.yml +++ b/config/general_config/featureset017.yml @@ -55,8 +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 -%}" + - "{% 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 @@ -72,8 +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 -%}" + - "{% 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 diff --git a/config/general_config/featureset018.yml b/config/general_config/featureset018.yml index 0ba598c8c..9a6194752 100644 --- a/config/general_config/featureset018.yml +++ b/config/general_config/featureset018.yml @@ -56,8 +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 -%}" + - "{% 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: @@ -72,8 +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 -%}" + - "{% 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 diff --git a/config/general_config/featureset019.yml b/config/general_config/featureset019.yml index 01a1f8c6e..7ee742805 100644 --- a/config/general_config/featureset019.yml +++ b/config/general_config/featureset019.yml @@ -55,8 +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 -%}" + - "{% 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 @@ -72,8 +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 -%}" + - "{% 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 diff --git a/config/general_config/featureset020.yml b/config/general_config/featureset020.yml index 26629edb9..907463417 100644 --- a/config/general_config/featureset020.yml +++ b/config/general_config/featureset020.yml @@ -51,7 +51,7 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-validate - tempest-setup - - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" + - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt table_of_contents: @@ -66,7 +66,7 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-validate - tempest-setup - - "{% if tempest_format == 'containers' -%}tempest_container{%- 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','queens'] -%} diff --git a/config/general_config/featureset021.yml b/config/general_config/featureset021.yml index 255efa125..b8e0dfb35 100644 --- a/config/general_config/featureset021.yml +++ b/config/general_config/featureset021.yml @@ -37,7 +37,7 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-validate - tempest-setup - - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" + - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt table_of_contents: @@ -51,4 +51,4 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-validate - tempest-setup - - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" + - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" diff --git a/config/general_config/featureset027.yml b/config/general_config/featureset027.yml index 94577f3ed..d4744dc10 100644 --- a/config/general_config/featureset027.yml +++ b/config/general_config/featureset027.yml @@ -78,7 +78,7 @@ artcl_create_docs_payload: - overcloud-prep-images - overcloud-prep-network - tempest-setup - - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" + - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt @@ -91,4 +91,4 @@ artcl_create_docs_payload: - overcloud-prep-images - overcloud-prep-network - tempest-setup - - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" + - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" diff --git a/config/general_config/featureset035.yml b/config/general_config/featureset035.yml index 6407e1170..a144c7cd9 100644 --- a/config/general_config/featureset035.yml +++ b/config/general_config/featureset035.yml @@ -47,7 +47,7 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-validate - tempest-setup - - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" + - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt table_of_contents: @@ -62,7 +62,7 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-validate - tempest-setup - - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" + - "{% if run_tempest|bool and tempest_format|default('packages') == '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 4f0d48f10..f649744aa 100644 --- a/config/general_config/featureset042.yml +++ b/config/general_config/featureset042.yml @@ -47,7 +47,7 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-validate - tempest-setup - - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" + - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt table_of_contents: @@ -62,7 +62,7 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-validate - tempest-setup - - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" + - "{% if run_tempest|bool and tempest_format|default('packages') == '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 0492dcd3d..59105243f 100644 --- a/config/general_config/featureset048.yml +++ b/config/general_config/featureset048.yml @@ -53,7 +53,7 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-validate - tempest-setup - - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" + - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt table_of_contents: @@ -68,4 +68,4 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-validate - tempest-setup - - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" + - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" diff --git a/config/general_config/minimal.yml b/config/general_config/minimal.yml index fe073e693..621c14439 100644 --- a/config/general_config/minimal.yml +++ b/config/general_config/minimal.yml @@ -55,7 +55,7 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-validate - tempest-setup - - "{% if tempest_format == 'containers' -%}tempest_container{%- endif -%}" + - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" included_static_docs: - env-setup-virt table_of_contents: @@ -70,7 +70,7 @@ artcl_create_docs_payload: - overcloud-deploy-post - overcloud-validate - tempest-setup - - "{% if tempest_format == 'containers' -%}tempest_container{%- 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+ diff --git a/config/general_config/pacemaker.yml b/config/general_config/pacemaker.yml index 7477a1b56..04960e591 100644 --- a/config/general_config/pacemaker.yml +++ b/config/general_config/pacemaker.yml @@ -54,8 +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 -%}" + - "{% 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: @@ -69,8 +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 -%}" + - "{% 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+