Remove EC2 latent builders

.travis.yml

@@ -14,7 +14,7 @@ matrix:
       os: osx
     - env: SALT_NODE_ID=servo-macpro1
       os: osx
-    - env: SALT_NODE_ID=linux1
+    - env: SALT_NODE_ID=servo-linux1
       os: linux
       sudo: required
       dist: trusty

.travis/test_pillars/buildbot/master.sls

@@ -7,7 +7,3 @@ buildbot:
     'gh-status-token': 'TEST_BUILDBOT_GH_STATUS_TOKEN'
     'gh-hook-secret': 'TEST_BUILDBOT_GH_HOOK_SECRET'
     'homu-secret': 'TEST_BUILDBOT_HOMU_SECRET'
-    'aws-access-key': 'TEST_BUILDBOT_AWS_ACCESS_KEY'
-    'aws-secret-key': 'TEST_BUILDBOT_AWS_SECRET_KEY'
-    'minion-public-key': 'TEST_BUILDBOT_MINION_PUBLIC_KEY'
-    'minion-private-key': 'TEST_BUILDBOT_MINION_PRIVATE_KEY'

buildbot/master/master.cfg

@@ -6,12 +6,9 @@ from buildbot.status.results import SUCCESS
 
 from passwords import HTTP_USERNAME, HTTP_PASSWORD, SLAVE_PASSWORD, CHANGE_PASSWORD
 from passwords import GITHUB_DOC_TOKEN, GITHUB_STATUS_TOKEN, HOMU_BUILDBOT_SECRET
-from passwords import AWS_ACCESS_KEY, AWS_SECRET_KEY
-from passwords import MINION_PUBLIC_KEY, MINION_PRIVATE_KEY
 
 SERVO_REPO = "https://github.com/servo/servo"
 HEAD_SLAVES = ["servo-head"]
-LINUX_SLAVES = ["linux3", "linux4"]
 LINUX_RESERVED_SLAVES = ["servo-linux1", "servo-linux2"]
 MAC_SLAVES = ["servo-mac1", "servo-mac2", "servo-mac3"]
 ANDROID_SLAVES = ["servo-linux-android1"]
@@ -32,41 +29,9 @@ c['caches'] = {
 
 ####### BUILDSLAVES
 
-def make_user_data(s):
-    return """\
-#!/bin/bash
-add-apt-repository -y ppa:saltstack/salt
-apt-get update
-apt-get -y install python-pip salt-minion
-echo 96.126.125.232 salt >> /etc/hosts
-echo %(s)s > /etc/salt/minion_id
-cat <<EOF > /etc/salt/pki/minion/minion.pem
-%(private_key)s
-EOF
-cat <<EOF > /etc/salt/pki/minion/minion.pub
-%(public_key)s
-EOF
-service salt-minion restart
-sleep 5
-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_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.4xlarge",
-        max_builds=1,
-        build_wait_timeout=60*60,
-        ami="ami-1b8c957a",
-        region="us-west-2",
-        identifier=AWS_ACCESS_KEY,
-        secret_identifier=AWS_SECRET_KEY,
-        keypair_name="servo",
-        security_name="servo-test",
-        tags={"Name": "servo-%s" % s},
-        user_data=make_user_data(s)))
 
 ####### CHANGESOURCES
 
@@ -329,14 +294,14 @@ def branch_priority(builder, requests):
 c['builders'] = []
 c['builders'].append(util.BuilderConfig(
     name="linux-dev",
-    slavenames=LINUX_RESERVED_SLAVES + LINUX_SLAVES,
+    slavenames=LINUX_RESERVED_SLAVES,
     factory=linux_dev_factory,
     nextBuild=branch_priority,
     category="auto",
 ))
 c['builders'].append(util.BuilderConfig(
     name="linux-rel",
-    slavenames=LINUX_RESERVED_SLAVES + LINUX_SLAVES,
+    slavenames=LINUX_RESERVED_SLAVES,
     factory=linux_rel_factory,
     nextBuild=branch_priority,
     category="auto",
@@ -392,7 +357,7 @@ c['builders'].append(util.BuilderConfig(
 ))
 c['builders'].append(util.BuilderConfig(
     name="cargo-linux",
-    slavenames=LINUX_RESERVED_SLAVES + LINUX_SLAVES,
+    slavenames=LINUX_RESERVED_SLAVES,
     factory=cargo_linux_factory,
     nextBuild=branch_priority,
     category="cargo_auto"

buildbot/master/passwords.py

@@ -5,7 +5,3 @@
 GITHUB_DOC_TOKEN = "{{pillar['buildbot']['credentials']['gh-doc-token'] }}"
 GITHUB_STATUS_TOKEN = "{{pillar['buildbot']['credentials']['gh-status-token'] }}"
 HOMU_BUILDBOT_SECRET = "{{pillar['buildbot']['credentials']['homu-secret'] }}"
-AWS_ACCESS_KEY = "{{pillar['buildbot']['credentials']['aws-access-key'] }}"
-AWS_SECRET_KEY = "{{pillar['buildbot']['credentials']['aws-secret-key'] }}"
-MINION_PUBLIC_KEY = """{{pillar['buildbot']['credentials']['minion-public-key'] }}"""
-MINION_PRIVATE_KEY = """{{pillar['buildbot']['credentials']['minion-private-key'] }}"""

top.sls

@@ -19,11 +19,6 @@ base:
     - buildbot.slave
     - xvfb
 
-  'linux\d+':
-    - match: pcre
-    - buildbot.slave
-    - xvfb
-
   'servo-linux-android\d+':
     - match: pcre
     - buildbot.slave