Bug 1491371 - Update .taskcluster.yml to run comm-task-env. r=dustin a=jorgk
authorRob Lemley <rob@thunderbird.net>
Mon, 25 Mar 2019 11:06:24 +0100
changeset 33967 fe65720478f1
parent 33966 e8b82a0fa34f
child 33968 009e7920f860
push id2393
push usermozilla@jorgk.com
push dateMon, 25 Mar 2019 10:52:11 +0000
treeherdercomm-beta@009e7920f860 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin, jorgk
bugs1491371
Bug 1491371 - Update .taskcluster.yml to run comm-task-env. r=dustin a=jorgk Prepends/wraps "run-task" execution with "comm-task-env". It will download the configuration file containing the Gecko h.m.o. repository information and set the appropriate environment variables so "run-task" can run. Differential Revision: https://phabricator.services.mozilla.com/D18133
.taskcluster.yml
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -140,20 +140,17 @@ tasks:
       priority: lowest
       retries: 5
 
       payload:
         env:
           # checkout-gecko uses these to check out the source; the inputs
           # to `mach taskgraph decision` are all on the command line.
           $merge:
-            - GECKO_BASE_REPOSITORY: 'https://hg.mozilla.org/mozilla-unified'
-              GECKO_HEAD_REPOSITORY: 'https://hg.mozilla.org/releases/mozilla-beta'
-              GECKO_HEAD_REF: 'default'
-              COMM_BASE_REPOSITORY: 'https://hg.mozilla.org/comm-central'
+            - COMM_BASE_REPOSITORY: 'https://hg.mozilla.org/comm-central'
               COMM_HEAD_REPOSITORY: '${repoUrl}'
               COMM_HEAD_REF: '${push.revision}'
               COMM_HEAD_REV: '${push.revision}'
               HG_STORE_PATH: /builds/worker/checkouts/hg-store
               TASKCLUSTER_CACHES: /builds/worker/checkouts
               # someday, these will be provided by the worker - Bug 1492664
               TASKCLUSTER_ROOT_URL: https://taskcluster.net
               TASKCLUSTER_PROXY_URL: http://taskcluster
@@ -178,16 +175,17 @@ tasks:
         # scriptworker patch!
         image: 'taskcluster/decision:2.1.0@sha256:6db3b697d7a3c7aba440d72f04199331b872111cefff57206b8b8b1d53230360'
 
         maxRunTime: 1800
 
         # TODO use mozilla-unified for the base repository once the tc-vcs
         # tar.gz archives are created or tc-vcs isn't being used.
         command:
+          - /builds/worker/bin/comm-task-env
           - /builds/worker/bin/run-task
           - '--vcs-checkout=/builds/worker/checkouts/gecko'
           - '--sparse-profile=build/sparse-profiles/taskgraph'
           - '--comm-checkout=/builds/worker/checkouts/gecko/comm'
           - '--'
           - bash
           - -cx
           - $let: