From 240b4a80b3c3498b990ddfa99074fb8e0617bbe0 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Dec 21 2020 11:16:47 +0000
Subject: fedpkg-build-ng: Only fetch arifact on success


Also add the fetch_artifact toggle when fetching
the built packages is not needed.

---

diff --git a/roles/fedpkg-build-ng/defaults/main.yaml b/roles/fedpkg-build-ng/defaults/main.yaml
index 0746d0f..348b2bb 100644
--- a/roles/fedpkg-build-ng/defaults/main.yaml
+++ b/roles/fedpkg-build-ng/defaults/main.yaml
@@ -2,3 +2,5 @@ scratch_build: True
 target: rawhide
 release: master
 arches: x86_64
+fetch_artifacts: true
+koji_task_url_base: "https://koji.fedoraproject.org/koji/taskinfo?taskID="
diff --git a/roles/fedpkg-build-ng/tasks/main.yaml b/roles/fedpkg-build-ng/tasks/main.yaml
index 15ab18c..5c91afc 100644
--- a/roles/fedpkg-build-ng/tasks/main.yaml
+++ b/roles/fedpkg-build-ng/tasks/main.yaml
@@ -47,13 +47,21 @@
   set_fact:
     task_id: "{{ fedpkg_build.stdout | regex_replace('\n', ' ') | regex_replace('.*Created task: (\\d+).*$', '\\1') }}"
 
-- name: Download artifacts from Koji
-  command: |
-    koji download-task --logs {{ task_id }}
-  args:
-    chdir: "{{ repo_artifact_dir }}"
+- name: Return koji task url
+  zuul_return:
+    data:
+      zuul:
+        artifacts:
+          - name: koji-task-url
+            url: "{{ koji_task_url_base }}{{ task_id}}"
 
 - block:
+  - name: Download artifacts from Koji
+    command: |
+      koji download-task --logs {{ task_id }}
+    args:
+      chdir: "{{ repo_artifact_dir }}"
+
   - name: Create repository
     command: createrepo .
     args:
@@ -66,8 +74,10 @@
           artifacts:
             - name: repo
               url: repo
-  when: fedpkg_build is not failure
+  when:
+    - fedpkg_build is not failure
+    - fetch_artifacts
 
 - fail:
-    msg: "Build failed - check build logs in the build artifacts"
+    msg: "Build failed - check build at {{ koji_task_url_base }}{{ task_id}}"
   when: fedpkg_build is failure