diff --git a/curl-artifact.sh b/curl-artifact.sh index 8c367dc90de..889caeec2bd 100755 --- a/curl-artifact.sh +++ b/curl-artifact.sh @@ -1,6 +1,12 @@ #!/bin/sh +task_id="$1" +artifact="$2" +shift 2 +url="https://queue.taskcluster.net/v1/task/${task_id}/artifacts/${artifact}" +echo "Fetching $url" curl \ --retry 5 \ --connect-timeout 10 \ - --location - https://queue.taskcluster.net/v1/task/$1/artifacts/$2 + --location \ + "$url" \ + "$@" diff --git a/decision-task/run.py b/decision-task/run.py index 1d1b175445b..88094321630 100644 --- a/decision-task/run.py +++ b/decision-task/run.py @@ -20,7 +20,7 @@ command_prefix = """ git checkout {event[after]} && """.format(event=event) -def create_task(name, command, artifacts=None, dependencies=None): +def create_task(name, command, artifacts=None, dependencies=None, env=None): task_id = taskcluster.slugId() payload = { "taskGroupId": os.environ["DECISION_TASK_ID"], @@ -45,6 +45,7 @@ def create_task(name, command, artifacts=None, dependencies=None): "-c", command_prefix + command ], + "env": env or {}, "artifacts": { "public/" + artifact_name: { "type": "file", @@ -68,4 +69,5 @@ create_task( "run task", "./run-task.sh", dependencies=[build_task], + env={"BUILD_TASK_ID": build_task}, ) diff --git a/run-task.sh b/run-task.sh index b4bb951d719..b8bdbccc509 100755 --- a/run-task.sh +++ b/run-task.sh @@ -2,4 +2,5 @@ ./curl-artifact.sh $BUILD_TASK_ID public/executable.gz -o executable.gz gunzip executable.gz +chmod +x executable ./executable