zuul/zuul-jobs
Code Issues Proposed changes

Merge "ara-report: use a different fact name for ara_report_path"

Browse Source
This commit is contained in:
Zuul 2018-06-28 01:08:12 +00:00 committed by Gerrit Code Review
commit 0c7d1aa3af
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
roles/ara-report/tasks/main.yaml
View File

@ -38,7 +38,7 @@
- name: Prefix the log path with the log root - name: Prefix the log path with the log root
set_fact: set_fact:
ara_report_path: "{{ zuul.executor.log_root }}/{{ ara_report_path }}" final_ara_report_path: "{{ zuul.executor.log_root }}/{{ ara_report_path }}"
- when: - when:
- ara_installed.rc == 0 - ara_installed.rc == 0
@ -48,7 +48,7 @@
# Always generate (true), never (false) or only on failure ('failure') # Always generate (true), never (false) or only on failure ('failure')
# Additionally cover for edge cases where zuul_success might be undefined # Additionally cover for edge cases where zuul_success might be undefined
- name: Generate ARA HTML output - name: Generate ARA HTML output
command: "ara generate html {{ ara_report_path }}" command: "ara generate html {{ final_ara_report_path }}"
environment: environment:
ARA_DATABASE: "sqlite:///{{ ara_database_path }}" ARA_DATABASE: "sqlite:///{{ ara_database_path }}"
when: ara_report_run | bool or when: ara_report_run | bool or
@ -56,7 +56,7 @@
register: ara_generated register: ara_generated
- name: Compress ARA HTML output - name: Compress ARA HTML output
command: gzip --recursive --best {{ ara_report_path }} command: gzip --recursive --best {{ final_ara_report_path }}
when: when:
- ara_compress_html | bool - ara_compress_html | bool
- not ara_generated | skipped - not ara_generated | skipped
@ -74,8 +74,8 @@
block: block:
- name: Create the ARA database report directory - name: Create the ARA database report directory
file: file:
path: "{{ ara_report_path }}" path: "{{ final_ara_report_path }}"
state: directory state: directory
- name: Save the ARA database - name: Save the ARA database
command: cp {{ ara_database_path }} {{ ara_report_path }} command: cp {{ ara_database_path }} {{ final_ara_report_path }}