Refactor buildbot states

Split the master and slave states into separate directories,
use the standard files/ directory, and use more Jinja templating.

buildbot/buildbot-github-listener.conf → buildbot/master/files/buildbot-github-listener.conf

@@ -1,10 +1,10 @@
-exec /usr/local/bin/github_buildbot.py -p 9010 -m localhost:9001 --auth=change:{{ pillar['buildbot']['credentials']['change-pass'] }} --secret={{ pillar['buildbot']['credentials']['gh-hook-secret'] }} -l /home/servo/buildbot/master/github-listener.log
+exec /usr/local/bin/github_buildbot.py -p 9010 -m localhost:9001 --auth=change:{{ pillar['buildbot']['credentials']['change-pass'] }} --secret={{ pillar['buildbot']['credentials']['gh-hook-secret'] }} -l {{ common.servo_home }}/buildbot/master/github-listener.log
 
 setuid servo
 setgid servo
 
 start on (local-filesystems and net-device-up IFACE!=lo)
 stop on runlevel [016]
 
-env HOME=/home/servo
+env HOME={{ common.servo_home }}
 

buildbot/master/files/buildbot-master.conf

@@ -0,0 +1,10 @@
+exec /usr/local/bin/buildbot start --nodaemon {{ common.servo_home }}/buildbot/master
+
+setuid servo
+setgid servo
+
+start on (local-filesystems and net-device-up IFACE!=lo)
+stop on runlevel [016]
+
+env HOME={{ common.servo_home }}
+

buildbot/master/buildbot.tac → buildbot/master/files/config/buildbot.tac

@@ -3,7 +3,7 @@ import os
 from twisted.application import service
 from buildbot.master import BuildMaster
 
-basedir = '/home/servo/buildbot/master'
+basedir = '{{ common.servo_home }}/buildbot/master'
 rotateLength = 10000000
 maxRotatedFiles = 10
 configfile = 'master.cfg'

buildbot/master/master.cfg → buildbot/master/files/config/master.cfg

@@ -97,9 +97,9 @@ linux_test_env = dict({
 linux_headless_env = dict({'SERVO_HEADLESS': '1'}, **linux_test_env)
 
 mac_test_env = dict({
-    'CARGO_HOME': '/Users/servo/.cargo',
+    'CARGO_HOME': '{{ common.servo_home }}/.cargo',
     'CCACHE': '/usr/local/bin/ccache',
-    'SERVO_CACHE_DIR': '/Users/servo/.servo'
+    'SERVO_CACHE_DIR': '{{ common.servo_home }}/.servo'
 }, **common_test_env)
 
 linux_dev_factory = create_servo_factory([

buildbot/master.sls → buildbot/master/init.sls

@@ -13,12 +13,12 @@ buildbot-master:
     - enable: True
     - watch:
       - pip: buildbot-master
-      - file: /home/servo/buildbot/master
+      - file: {{ common.servo_home }}/buildbot/master
       - file: /etc/init/buildbot-master.conf
 
-/home/servo/buildbot/master:
+{{ common.servo_home }}/buildbot/master:
   file.recurse:
-    - source: salt://buildbot/master
+    - source: salt://{{ tpldir }}/files/config
     - user: servo
     - group: servo
     - dir_mode: 755
@@ -29,25 +29,30 @@ buildbot-master:
 
 /etc/init/buildbot-master.conf:
   file.managed:
-    - source: salt://buildbot/buildbot-master.conf
+    - source: salt://{{ tpldir }}/files/buildbot-master.conf
     - user: root
     - group: root
     - mode: 644
+    - template: jinja
+    - context:
+        common: {{ common }}
 
 /usr/local/bin/github_buildbot.py:
   file.managed:
-    - source: salt://buildbot/github_buildbot.py
+    - source: salt://{{ tpldir }}/files/github_buildbot.py
     - user: root
     - group: root
     - mode: 755
 
 /etc/init/buildbot-github-listener.conf:
   file.managed:
-    - source: salt://buildbot/buildbot-github-listener.conf
-    - template: jinja
+    - source: salt://{{ tpldir }}/files/buildbot-github-listener.conf
     - user: root
     - group: root
     - mode: 644
+    - template: jinja
+    - context:
+        common: {{ common }}
 
 buildbot-github-listener:
   service.running:
@@ -58,7 +63,7 @@ buildbot-github-listener:
 
 remove-old-build-logs:
   cron.present:
-    - name: 'find /home/servo/buildbot/master/*/*.bz2 -mtime +5 -delete'
+    - name: 'find {{ common.servo_home }}/buildbot/master/*/*.bz2 -mtime +5 -delete'
     - user: root
     - minute: 1
     - hour: 0

buildbot/slave/files/buildbot-slave.conf

@@ -0,0 +1,10 @@
+exec /usr/local/bin/buildslave start --nodaemon {{ common.servo_home }}/buildbot/slave
+
+setuid servo
+setgid servo
+
+start on (local-filesystems and net-device-up IFACE!=lo)
+stop on runlevel [016]
+
+env HOME={{ common.servo_home }}
+

buildbot/slave/buildbot.tac → buildbot/slave/files/config/buildbot.tac

@@ -4,11 +4,7 @@ import os
 from buildslave.bot import BuildSlave
 from twisted.application import service
 
-{% if grains["kernel"] != "Darwin" %}
-basedir = '/home/servo/buildbot/slave'
-{% else %}
-basedir = '/Users/servo/buildbot/slave'
-{% endif %}
+basedir = '{{ common.servo_home }}/buildbot/slave'
 rotateLength = 10000000
 maxRotatedFiles = 10
 

buildbot/slave.sls → buildbot/slave/init.sls

@@ -9,8 +9,7 @@ buildbot-slave-dependencies:
 
 {{ common.servo_home }}/buildbot/slave:
   file.recurse:
-    - source: salt://buildbot/slave
-    - template: jinja
+    - source: salt://{{ tpldir }}/files/config
     - user: servo
     {% if grains['kernel'] == 'Darwin' %}
     - group: staff
@@ -19,6 +18,9 @@ buildbot-slave-dependencies:
     {% endif %}
     - dir_mode: 755
     - file_mode: 644
+    - template: jinja
+    - context:
+        common: {{ common }}
     {% if grains['kernel'] != 'Darwin' %}
     - watch_in:
       - service: buildbot-slave
@@ -28,7 +30,7 @@ buildbot-slave-dependencies:
 
 /Library/LaunchDaemons/net.buildbot.buildslave.plist:
   file.managed:
-    - source: salt://buildbot/net.buildbot.buildslave.plist
+    - source: salt://{{ tpldir }}/files/net.buildbot.buildslave.plist
     - user: root
     - group: wheel
     - mode: 644
@@ -43,10 +45,13 @@ launchctl load -w /Library/LaunchDaemons/net.buildbot.buildslave.plist:
 
 /etc/init/buildbot-slave.conf:
   file.managed:
-    - source: salt://buildbot/buildbot-slave.conf
+    - source: salt://{{ tpldir }}/files/buildbot-slave.conf
     - user: root
     - group: root
     - mode: 644
+    - template: jinja
+    - context:
+        common: {{ common }}
     - watch_in:
       - service: buildbot-slave
 
@@ -55,4 +60,3 @@ buildbot-slave:
     - enable: True
 
 {% endif %}
-