From b5dc58d277f8d392214270a6e0adb87896d1bc8a Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Fri, 14 Dec 2018 09:46:06 +0100
Subject: [PATCH] Tasckluster: add a second macOS worker

Tweak the Salt definition of /Library/LaunchAgents/net.generic.worker.plist
so that the `user` parameter for the template file is not taken
as a parameter for `file.managed`.
(The first run created a file owned by `worker` instead of `root`.)
---
 etc/taskcluster/macos/config/roster                     | 2 ++
 etc/taskcluster/macos/states/generic-worker.plist.jinja | 2 +-
 etc/taskcluster/macos/states/generic-worker.sls         | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/etc/taskcluster/macos/config/roster b/etc/taskcluster/macos/config/roster
index c65197ac82e..f4e16de6609 100644
--- a/etc/taskcluster/macos/config/roster
+++ b/etc/taskcluster/macos/config/roster
@@ -1,2 +1,4 @@
 mac1:
     host: servo-tc-mac1.servo.org
+mac2:
+    host: servo-tc-mac2.servo.org
diff --git a/etc/taskcluster/macos/states/generic-worker.plist.jinja b/etc/taskcluster/macos/states/generic-worker.plist.jinja
index 39fa43a5d87..35500cc3abb 100644
--- a/etc/taskcluster/macos/states/generic-worker.plist.jinja
+++ b/etc/taskcluster/macos/states/generic-worker.plist.jinja
@@ -7,7 +7,7 @@
     <key>StandardOutPath</key>   <string>stdout.log</string>
     <key>StandardErrorPath</key> <string>stderr.log</string>
     <key>WorkingDirectory</key>  <string>{{ home }}</string>
-    <key>UserName</key>          <string>{{ user }}</string>
+    <key>UserName</key>          <string>{{ username }}</string>
     <key>ProgramArguments</key>  <array>
         <string>{{ bin }}/generic-worker</string>
         <string>run</string>
diff --git a/etc/taskcluster/macos/states/generic-worker.sls b/etc/taskcluster/macos/states/generic-worker.sls
index 83f4561deff..930d52529bc 100644
--- a/etc/taskcluster/macos/states/generic-worker.sls
+++ b/etc/taskcluster/macos/states/generic-worker.sls
@@ -46,7 +46,7 @@ GMT:
         provisionerId: proj-servo
         workerType: macos
         workerGroup: servo-macos
-        workerId: mac1
+        workerId: {{ grains["id"] }}
         tasksDir: {{ home }}/tasks
         publicIP: {{ salt.network.ip_addrs()[0] }}
         signingKeyLocation: {{ home }}/key
@@ -85,7 +85,7 @@ GMT:
       bin: {{ bin }}
       etc: {{ etc }}
       home: {{ home }}
-      user: {{ user }}
+      username: {{ user }}
 
 net.generic.worker:
   service.running: