Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Tasckluster: add a second macOS worker

Browse source 
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`.)
This commit is contained in:
Simon Sapin 2018-12-14 09:46:06 +01:00
parent 0cf129208f
commit b5dc58d277
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
etc/taskcluster/macos/config/roster
View file

@ -1,2 +1,4 @@
mac1: mac1:
host: servo-tc-mac1.servo.org host: servo-tc-mac1.servo.org
mac2:
host: servo-tc-mac2.servo.org

2
etc/taskcluster/macos/states/generic-worker.plist.jinja
View file

@ -7,7 +7,7 @@
<key>StandardOutPath</key> <string>stdout.log</string> <key>StandardOutPath</key> <string>stdout.log</string>
<key>StandardErrorPath</key> <string>stderr.log</string> <key>StandardErrorPath</key> <string>stderr.log</string>
<key>WorkingDirectory</key> <string>{{ home }}</string> <key>WorkingDirectory</key> <string>{{ home }}</string>
<key>UserName</key> <string>{{ user }}</string> <key>UserName</key> <string>{{ username }}</string>
<key>ProgramArguments</key> <array> <key>ProgramArguments</key> <array>
<string>{{ bin }}/generic-worker</string> <string>{{ bin }}/generic-worker</string>
<string>run</string> <string>run</string>

4
etc/taskcluster/macos/states/generic-worker.sls
View file

@ -46,7 +46,7 @@ GMT:
provisionerId: proj-servo provisionerId: proj-servo
workerType: macos workerType: macos
workerGroup: servo-macos workerGroup: servo-macos
workerId: mac1 workerId: {{ grains["id"] }}
tasksDir: {{ home }}/tasks tasksDir: {{ home }}/tasks
publicIP: {{ salt.network.ip_addrs()[0] }} publicIP: {{ salt.network.ip_addrs()[0] }}
signingKeyLocation: {{ home }}/key signingKeyLocation: {{ home }}/key
@ -85,7 +85,7 @@ GMT:
bin: {{ bin }} bin: {{ bin }}
etc: {{ etc }} etc: {{ etc }}
home: {{ home }} home: {{ home }}
user: {{ user }} username: {{ user }}
net.generic.worker: net.generic.worker:
service.running: service.running: