Browse Source

Merge "Fixed logstash file name for tempest"

tags/2.1.1
Zuul 10 months ago
parent
commit
7f6a3ff733
2 changed files with 6 additions and 7 deletions
  1. 6
    6
      roles/collect-logs/defaults/main.yml
  2. 0
    1
      roles/validate-tempest/README.md

+ 6
- 6
roles/collect-logs/defaults/main.yml View File

@@ -140,12 +140,12 @@ artcl_zuul_swift_upload_path: /usr/local/bin
140 140
 artcl_collect_sosreport: false
141 141
 artcl_sosreport_options: "--batch"
142 142
 
143
-## Doc generation specific vars
143
+# Doc generation specific vars
144 144
 artcl_gen_docs: false
145 145
 artcl_create_docs_payload:
146
-    included_deployment_scripts: []
147
-    included_static_docs: []
148
-    table_of_contents: []
146
+  included_deployment_scripts: []
147
+  included_static_docs: []
148
+  table_of_contents: []
149 149
 artcl_docs_source_dir: "{{ local_working_dir }}/usr/local/share/ansible/roles/collect-logs/docs/source"
150 150
 artcl_docs_build_dir: "{{ artcl_collect_dir }}/docs/build"
151 151
 artcl_verify_sphinx_build: false
@@ -184,10 +184,10 @@ artcl_logstash_files:
184 184
   - /home/*/workload_launch.log
185 185
   - /home/*/pkg_mgr_mirror_error.log
186 186
   - /home/*/pkg_mgr_mirror.log
187
-  - /home/*/tempest_output.log
187
+  - /home/*/tempest.log
188 188
   - /var/log/bootstrap-subnodes.log
189 189
   - /var/log/tripleo-container-image-prepare.log
190
-#ara_graphite_server: graphite.tripleo.org
190
+# ara_graphite_server: graphite.tripleo.org
191 191
 ara_graphite_prefix: "tripleo.{{ lookup('env', 'STABLE_RELEASE')|default('master', true) }}.{{ lookup('env', 'TOCI_JOBTYPE') }}."
192 192
 ara_only_successful_tasks: true
193 193
 ara_tasks_map:

+ 0
- 1
roles/validate-tempest/README.md View File

@@ -17,7 +17,6 @@ Role Variables
17 17
 * `tempest_format`: venv/packages/container - Which tempest installation to use - either install python virtual environment
18 18
                     with installed there python modules from requirements file, or to use installed with RDO RPM packages
19 19
                     or to use Kolla provided tempest container image (default: packages)
20
-* `tempest_log_file` - name of log file for tempest run (default: tempest_output.log)
21 20
 * `test_white_regex` - tests regular expression for tempest run, i.e. smoke or tempest.api.object_storage|keystone_tempest_plugin.
22 21
 * `run_tempest`: false/true - to run tempest or not (default: false)
23 22
 * `post_tempest`: false/true - to run post processing of tempest results after tempest run

Loading…
Cancel
Save