From 2e1a3b169b057b799c855eea65cd0c18c9e99180 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Fri, 21 Sep 2018 12:46:55 +0200
Subject: [PATCH] Use curl-artifct.sh

---
 etc/ci/taskcluster/curl-artifact.sh | 2 +-
 etc/ci/taskcluster/decision-task.py | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/etc/ci/taskcluster/curl-artifact.sh b/etc/ci/taskcluster/curl-artifact.sh
index 54af839ae55..ad180bbc7d7 100755
--- a/etc/ci/taskcluster/curl-artifact.sh
+++ b/etc/ci/taskcluster/curl-artifact.sh
@@ -2,7 +2,7 @@
 task_id="$1"
 artifact="$2"
 shift 2
-url="https://queue.taskcluster.net/v1/task/${task_id}/artifacts/${artifact}"
+url="https://queue.taskcluster.net/v1/task/${task_id}/artifacts/public/${artifact}"
 echo "Fetching $url" >&2
 curl \
     --retry 5 \
diff --git a/etc/ci/taskcluster/decision-task.py b/etc/ci/taskcluster/decision-task.py
index c3f8549314d..1246b0e318f 100644
--- a/etc/ci/taskcluster/decision-task.py
+++ b/etc/ci/taskcluster/decision-task.py
@@ -82,13 +82,7 @@ def main():
 
     def create_run_task(*, script, env=None, **kwargs):
         fetch_build = """
-            curl \
-                "https://queue.taskcluster.net/v1/task/${BUILD_TASK_ID}/artifacts/public/target.tar.gz" \
-                --retry 5 \
-                --connect-timeout 10 \
-                --location \
-                --fail \
-                | tar -xz
+            ./etc/ci/taskcluster/curl-artifact.sh ${BUILD_TASK_ID} target.tar.gz | tar -xz
         """
         kwargs.setdefault("artifacts", []).extend(
             ("/repo/" + word, log_artifacts_expiry)