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

@@ -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+

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+

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

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

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

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

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'] -%}

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 -%}"

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 -%}"

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

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

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 -%}"

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+

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+