Bug 1525072 - Port bug 1524358: remove slugid and commit message from .taskcluster.yml. rs=bustage-fix a=jorgk
authorRob Lemley <rob@thunderbird.net>
Mon, 04 Feb 2019 13:34:08 -0500
changeset 34322 7b3232d39834e897c97c00a9cfab2506b3d661cd
parent 34321 bd1158d19cdf2eaac8e7e8448ed49ebc9cb9d488
child 34323 306a8f3a372d36bede07c7d438e308be54121c89
push id389
push userclokep@gmail.com
push dateMon, 18 Mar 2019 19:01:53 +0000
reviewersbustage-fix, jorgk
bugs1525072, 1524358
Bug 1525072 - Port bug 1524358: remove slugid and commit message from .taskcluster.yml. rs=bustage-fix a=jorgk Port of https://hg.mozilla.org/mozilla-central/rev/7fb53ad56f85 https://hg.mozilla.org/mozilla-central/rev/5b3dfdf70126 Replaces slugid function with ${ownTaskId} and removes GECKO_COMMIT_MSG from .taskcluster.yml.
.taskcluster.yml
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -14,23 +14,23 @@ tasks:
       repoUrl: {$if: 'repository.url[-1] == "/"', then: {$eval: 'repository.url[:-1]'}, else: {$eval: 'repository.url'}}
       # Hardcode cron push info for now, so that we can transition to using real values without breaking callers of Chain of Trust
       _pushId: {$if: 'tasks_for == "cron"', then: '-1', else: {$eval: 'push.pushlog_id'}}
       # action tasks can fail because of no pushdate or push comment information in context, so include them in
       # hardcodes (even though they don't use these variables)
       _pushDate: {$if: 'tasks_for == "cron" || tasks_for == "action"', then: '0', else: {$eval: 'push.pushdate'}}
       _pushComment: {$if: 'tasks_for == "cron" || tasks_for == "action"', then: '', else: {$eval: 'push.comment'}}
     in:
-      taskId: {$if: 'tasks_for != "action"', then: '${as_slugid("decision")}'}
+      taskId: {$if: 'tasks_for != "action"', then: '${ownTaskId}'}
       taskGroupId:
         $if: 'tasks_for == "action"'
         then:
           '${action.taskGroupId}'
         else:
-          '${as_slugid("decision")}'  # same as taskId; this is how automation identifies a decision tsak
+          '${ownTaskId}'  # same as taskId; this is how automation identifies a decision tsak
       schedulerId: 'gecko-level-${repository.level}'
 
       created: {$fromNow: ''}
       deadline: {$fromNow: '1 day'}
       expires: {$fromNow: '1 year 1 second'}  # 1 second so artifacts expire first, despite rounding errors
 
       metadata:
         $merge:
@@ -112,21 +112,16 @@ tasks:
               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
-            - $if: 'tasks_for != "action"'
-              then:
-                # scriptworker expects an environment variable named GECKO_COMMIT_MSG,
-                # see: https://github.com/mozilla-releng/scriptworker/blob/master/scriptworker/task.py
-                GECKO_COMMIT_MSG: '${_pushComment}'
             - $if: 'tasks_for == "action"'
               then:
                 ACTION_TASK_GROUP_ID: '${action.taskGroupId}'  # taskGroupId of the target task
                 ACTION_TASK_ID: {$json: {$eval: 'taskId'}}     # taskId of the target task (JSON-encoded)
                 ACTION_INPUT: {$json: {$eval: 'input'}}
                 ACTION_CALLBACK: '${action.cb_name}'
                 ACTION_PARAMETERS: {$json: {$eval: 'parameters'}}
 
@@ -167,17 +162,16 @@ tasks:
               else: >
                 cd /builds/worker/checkouts/gecko &&
                 ln -s /builds/worker/artifacts artifacts &&
                 ./mach --log-no-times taskgraph decision
                 --root=comm/taskcluster/ci
                 --pushlog-id='${push.pushlog_id}'
                 --pushdate='${push.pushdate}'
                 --project='${repository.project}'
-                --message="$GECKO_COMMIT_MSG"
                 --owner='${ownerEmail}'
                 --level='${repository.level}'
                 --base-repository="$GECKO_BASE_REPOSITORY"
                 --head-repository="$GECKO_HEAD_REPOSITORY"
                 --head-ref="$GECKO_HEAD_REF"
                 --head-rev="$GECKO_HEAD_REV"
                 --comm-base-repository="$COMM_BASE_REPOSITORY"
                 --comm-head-repository="$COMM_HEAD_REPOSITORY"