Bug 1525072 - Port bug 1524358: remove slugid and commit message from .taskcluster.yml. rs=bustage-fix a=jorgk draft
authorRob Lemley <rob@thunderbird.net>
Sat, 09 Mar 2019 11:47:20 +0100
changeset 71703 044f908fc99b85ba1f46bbd77399dbaa0d53a27c
parent 71702 58c14bf525f926a25a572dd0c1ae90b42349177c
child 71704 d04633b2b37fc4e892fe9000fb70fae9bab28009
push id7940
push usermozilla@jorgk.com
push dateSat, 09 Mar 2019 10:51:22 +0000
treeherdertry-comm-central@d04633b2b37f [default view] [failures only]
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
@@ -8,23 +8,23 @@ version: 1
 
 tasks:
   - $let:
       # sometimes the push user is just `ffxbld` or the like, but we want an email-like field..
       ownerEmail: {$if: '"@" in push.owner', then: '${push.owner}', else: '${push.owner}@noreply.mozilla.org'}
       # ensure there's no trailing `/` on the repo URL
       repoUrl: {$if: 'repository.url[-1] == "/"', then: {$eval: 'repository.url[:-1]'}, else: {$eval: 'repository.url'}}
     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:
@@ -101,19 +101,16 @@ tasks:
               GECKO_HEAD_REF: 'THUNDERBIRD_60_VERBRANCH'
               GECKO_HEAD_REV: '12fc7a7ee5502c265c7900dbf02915db7d755816'
               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: /buillds/worker/checkouts/hg-store
               TASKCLUSTER_CACHES: /builds/worker/checkouts
-            - $if: 'tasks_for != "action"'
-              then:
-                COMM_COMMIT_MSG: '${push.comment}'
             - $if: 'tasks_for == "action"'
               then:
                 ACTION_TASK_GROUP_ID: '${ownTaskId}'
                 ACTION_TASK_ID: {$json: {$eval: 'taskId'}}
                 ACTION_TASK: {$json: {$eval: 'task'}}
                 ACTION_INPUT: {$json: {$eval: 'input'}}
                 ACTION_CALLBACK: '${action.cb_name}'
                 ACTION_PARAMETERS: {$json: {$eval: 'parameters'}}
@@ -155,17 +152,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="$COMM_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"