From 02e2d48b352eb7db8294a70c9b5a76b225f7508d Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 20 Sep 2018 16:23:02 +0200 Subject: [PATCH] =?UTF-8?q?command=20=E2=86=92=20script?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit abb46381510c549e37f615031add0f01eacd0b8c. --- decision-task.py | 2 +- decisionlib.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/decision-task.py b/decision-task.py index 5704df00bcd..2645092a012 100644 --- a/decision-task.py +++ b/decision-task.py @@ -53,7 +53,7 @@ def main(): decision.create_task_with_in_tree_dockerfile( task_name="Linux x86_64: tidy + dev build + unit tests", - command=""" + script=""" #./mach test-tidy --no-progress --all ./mach build --dev #./mach test-unit diff --git a/decisionlib.py b/decisionlib.py index 82ce6783232..56cef29a8f0 100644 --- a/decisionlib.py +++ b/decisionlib.py @@ -78,7 +78,7 @@ class DecisionTask: return self.create_task( task_name="docker image build task for image: " + self.image_name(dockerfile), - command=""" + script=""" echo "$DOCKERFILE" | docker build -t taskcluster-built - docker save taskcluster-built | lz4 > /%s """ % self.DOCKER_IMAGE_ARTIFACT_FILENAME, @@ -114,7 +114,7 @@ class DecisionTask: else: return basename - def create_task(self, *, task_name, command, image, max_run_time_minutes, + def create_task(self, *, task_name, script, image, max_run_time_minutes, artifacts=None, dependencies=None, env=None, cache=None, scopes=None, routes=None, extra=None, features=None, with_repo=True): @@ -129,12 +129,12 @@ class DecisionTask: for k in ["GIT_URL", "GIT_REF", "GIT_SHA"]: env[k] = os.environ[k] - command = """ + script = """ git init repo cd repo git fetch --depth 1 "$GIT_URL" "$GIT_REF" git reset --hard "$GIT_SHA" - """ + command + """ + script # https://docs.taskcluster.net/docs/reference/workers/docker-worker/docs/environment decision_task_id = os.environ["TASK_ID"] @@ -167,7 +167,7 @@ class DecisionTask: "-x", "-e", "-c", - deindent(command) + deindent(script) ], "env": env, "artifacts": {