diff --git a/playbooks/base-test/post-logs.yaml b/playbooks/base-test/post-logs.yaml index 88ac832ecb..ad044d79ff 100644 --- a/playbooks/base-test/post-logs.yaml +++ b/playbooks/base-test/post-logs.yaml @@ -7,7 +7,7 @@ - hosts: "{{ site_logs.fqdn }}" gather_facts: False roles: - - role: upload-logs + - role: test-upload-logs zuul_log_url: "http://logs.openstack.org" - hosts: localhost diff --git a/roles/test-upload-logs/README.rst b/roles/test-upload-logs/README.rst index 98dcb43f83..e9e51f4adb 100644 --- a/roles/test-upload-logs/README.rst +++ b/roles/test-upload-logs/README.rst @@ -13,6 +13,14 @@ This uploads logs to a static webserver using SSH. The root path to the logs on the logserver. +.. zuul:rolevar:: zuul_log_verbose + :default: false + + The synchronize task in this role outputs a lot of information. By + default, no_log is set to avoid overwhelming a reader of the logs. + Set this to true to disable that behavior if it becomes necessary + to debug this role. + .. zuul:rolevar:: zuul_site_upload_logs :default: true diff --git a/roles/test-upload-logs/tasks/main.yaml b/roles/test-upload-logs/tasks/main.yaml index 661ce9aec2..e10367c877 100644 --- a/roles/test-upload-logs/tasks/main.yaml +++ b/roles/test-upload-logs/tasks/main.yaml @@ -29,7 +29,7 @@ rsync_opts: - "--exclude=job-output.txt" - "--exclude=job-output.json" - no_log: true + no_log: "{{ not zuul_log_verbose }}" # After this point there are no more logs - name: gzip console log and json output diff --git a/roles/test-upload-logs/vars/main.yaml b/roles/test-upload-logs/vars/main.yaml index 4b6a101307..c3a3be79e9 100644 --- a/roles/test-upload-logs/vars/main.yaml +++ b/roles/test-upload-logs/vars/main.yaml @@ -1 +1,2 @@ zuul_logserver_root: /srv/static/logs +zuul_log_verbose: false