Merge "test-upload-logs-swift: move script artifact after upload"

This commit is contained in:
Zuul 2020-03-20 01:36:00 +00:00 committed by Gerrit Code Review
commit 476c6d918d

View File

@ -22,16 +22,6 @@
when:
- zuul_log_include_download_script
- name: Set download template artifact
zuul_return:
data:
zuul:
artifacts:
- name: bulk-download
url: '{{ upload_results.url }}/{{ zuul_log_download_template[:-3] }}'
when:
- zuul_log_include_download_script
- name: Upload logs to swift
delegate_to: localhost
zuul_swift_upload:
@ -47,6 +37,16 @@
download_template: "{{ download_template | default(omit) }}"
register: upload_results
- name: Set download template artifact
zuul_return:
data:
zuul:
artifacts:
- name: bulk-download
url: '{{ upload_results.url }}/{{ zuul_log_download_template[:-3] }}'
when:
- zuul_log_include_download_script
- name: Return log URL to Zuul
delegate_to: localhost
zuul_return: