From 114a3a97c980c719881c2292c1858416cf0bd07c Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Fri, 20 Mar 2020 11:20:35 +1100
Subject: [PATCH] test-upload-logs-swift: move script artifact after upload

We need to move this after the upload step, because this is where we
get the final URL.

Change-Id: I76aff454be75d45fcb27e900c51aac9bc6a5f25a
---
 roles/test-upload-logs-swift/tasks/main.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/roles/test-upload-logs-swift/tasks/main.yaml b/roles/test-upload-logs-swift/tasks/main.yaml
index 52e1d1551..320483989 100644
--- a/roles/test-upload-logs-swift/tasks/main.yaml
+++ b/roles/test-upload-logs-swift/tasks/main.yaml
@@ -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: