From 5102788c23e8984bd13e48377682d77f8d9065c6 Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Wed, 14 Nov 2018 14:31:41 +0530 Subject: [PATCH] Fixed logstash file name for tempest * The file getting generated is tempest.log under /home/zuul/ tempest.log not tempest-output.log that's why it is not able to indexed in logstash. * And tempest_log_file var is used twice in validate-tempest role and tempest.log is used at each place which also leads that tempest_output.log was never found in ci logs. Related-Bug:#1802971 Change-Id: I9bb9f8bdd0a17d2a1481356caaf186ed6348f6ba --- roles/collect-logs/defaults/main.yml | 12 ++++++------ roles/validate-tempest/README.md | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/roles/collect-logs/defaults/main.yml b/roles/collect-logs/defaults/main.yml index 70b75959b..25e227ef7 100644 --- a/roles/collect-logs/defaults/main.yml +++ b/roles/collect-logs/defaults/main.yml @@ -140,12 +140,12 @@ artcl_zuul_swift_upload_path: /usr/local/bin artcl_collect_sosreport: false artcl_sosreport_options: "--batch" -## Doc generation specific vars +# Doc generation specific vars artcl_gen_docs: false artcl_create_docs_payload: - included_deployment_scripts: [] - included_static_docs: [] - table_of_contents: [] + included_deployment_scripts: [] + included_static_docs: [] + table_of_contents: [] artcl_docs_source_dir: "{{ local_working_dir }}/usr/local/share/ansible/roles/collect-logs/docs/source" artcl_docs_build_dir: "{{ artcl_collect_dir }}/docs/build" artcl_verify_sphinx_build: false @@ -184,10 +184,10 @@ artcl_logstash_files: - /home/*/workload_launch.log - /home/*/pkg_mgr_mirror_error.log - /home/*/pkg_mgr_mirror.log - - /home/*/tempest_output.log + - /home/*/tempest.log - /var/log/bootstrap-subnodes.log - /var/log/tripleo-container-image-prepare.log -#ara_graphite_server: graphite.tripleo.org +# ara_graphite_server: graphite.tripleo.org ara_graphite_prefix: "tripleo.{{ lookup('env', 'STABLE_RELEASE')|default('master', true) }}.{{ lookup('env', 'TOCI_JOBTYPE') }}." ara_only_successful_tasks: true ara_tasks_map: diff --git a/roles/validate-tempest/README.md b/roles/validate-tempest/README.md index 283181bf2..59e35b991 100644 --- a/roles/validate-tempest/README.md +++ b/roles/validate-tempest/README.md @@ -17,7 +17,6 @@ Role Variables * `tempest_format`: venv/packages/container - Which tempest installation to use - either install python virtual environment with installed there python modules from requirements file, or to use installed with RDO RPM packages or to use Kolla provided tempest container image (default: packages) -* `tempest_log_file` - name of log file for tempest run (default: tempest_output.log) * `test_white_regex` - tests regular expression for tempest run, i.e. smoke or tempest.api.object_storage|keystone_tempest_plugin. * `run_tempest`: false/true - to run tempest or not (default: false) * `post_tempest`: false/true - to run post processing of tempest results after tempest run