Add EC2 reserved instances

buildbot/master/master.cfg

@@ -11,8 +11,8 @@ from passwords import MINION_PUBLIC_KEY, MINION_PRIVATE_KEY
 
 SERVO_REPO = "https://github.com/servo/servo"
 HEAD_SLAVES = ["servo-head"]
-LINUX_SLAVES = ["linux1", "linux2", "linux3", "linux4", "linux5"]
-LINUX_LINODE_SLAVES = []
+LINUX_SLAVES = ["linux3", "linux4"]
+LINUX_RESERVED_SLAVES = ["servo-linux1", "servo-linux2"]
 MAC_SLAVES = ["servo-mac1", "servo-mac2", "servo-mac3"]
 ANDROID_SLAVES = ["servo-linux-android1"]
 
@@ -52,11 +52,11 @@ salt-call state.highstate""" % \
     {'private_key': MINION_PRIVATE_KEY.strip(), 'public_key':  MINION_PUBLIC_KEY.strip(), 's': s}
 
 c['slaves'] = []
-for s in MAC_SLAVES + ANDROID_SLAVES + HEAD_SLAVES + LINUX_LINODE_SLAVES:
+for s in MAC_SLAVES + ANDROID_SLAVES + HEAD_SLAVES + LINUX_RESERVED_SLAVES:
     c['slaves'].append(buildslave.BuildSlave(s, SLAVE_PASSWORD, max_builds=1))
 for s in LINUX_SLAVES:
     c['slaves'].append(buildslave.EC2LatentBuildSlave(
-        s, SLAVE_PASSWORD, "c4.8xlarge",
+        s, SLAVE_PASSWORD, "c4.4xlarge",
         max_builds=1,
         build_wait_timeout=60*60,
         ami="ami-1b8c957a",
@@ -199,7 +199,7 @@ linux_rel_factory = create_servo_factory([
                        env=linux_headless_env, logfiles={"test-wpt.log": "test-wpt.log"}),
     #steps.ShellCommand(command=["pkill", "-x", "servo"], decodeRC={0: SUCCESS, 1: SUCCESS}),
     steps.ShellCommand(command=["gzip", "test-wpt.log"], env=linux_headless_env),
-    steps.ShellCommand(command=["./mach", "test-css", "--release", "--processes", "24",
+    steps.ShellCommand(command=["./mach", "test-css", "--release", "--processes", "16",
                                 "--log-raw", "test-css.log"],
                        env=linux_headless_env, logfiles={"test-css.log": "test-css.log"}),
     #steps.ShellCommand(command=["pkill", "-x", "servo"], decodeRC={0: SUCCESS, 1: SUCCESS}),
@@ -329,14 +329,14 @@ def branch_priority(builder, requests):
 c['builders'] = []
 c['builders'].append(util.BuilderConfig(
     name="linux-dev",
-    slavenames=LINUX_SLAVES + LINUX_LINODE_SLAVES,
+    slavenames=LINUX_RESERVED_SLAVES + LINUX_SLAVES,
     factory=linux_dev_factory,
     nextBuild=branch_priority,
     category="auto",
 ))
 c['builders'].append(util.BuilderConfig(
     name="linux-rel",
-    slavenames=LINUX_SLAVES + LINUX_LINODE_SLAVES,
+    slavenames=LINUX_RESERVED_SLAVES + LINUX_SLAVES,
     factory=linux_rel_factory,
     nextBuild=branch_priority,
     category="auto",
@@ -392,7 +392,7 @@ c['builders'].append(util.BuilderConfig(
 ))
 c['builders'].append(util.BuilderConfig(
     name="cargo-linux",
-    slavenames=LINUX_SLAVES + LINUX_LINODE_SLAVES,
+    slavenames=LINUX_RESERVED_SLAVES + LINUX_SLAVES,
     factory=cargo_linux_factory,
     nextBuild=branch_priority,
     category="cargo_auto"

top.sls

@@ -10,10 +10,15 @@ base:
     - homu
     - nginx
 
-  'servo-(linux|mac|macpro)\d+':
+  'servo-(mac|macpro)\d+':
     - match: pcre
     - buildbot.slave
 
+  'servo-linux\d+':
+    - match: pcre
+    - buildbot.slave
+    - xvfb
+
   'linux\d+':
     - match: pcre
     - buildbot.slave