Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a linode slave for fallback when EC2 is borked #133

Merged
merged 1 commit into from Oct 25, 2015
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -12,6 +12,7 @@ from passwords import MINION_PUBLIC_KEY, MINION_PRIVATE_KEY
SERVO_REPO = "https://github.com/servo/servo"
HEAD_SLAVES = ["servo-head"]
LINUX_SLAVES = ["linux1", "linux2"]
LINUX_LINODE_SLAVES = ["servo-linux1"]
MAC_SLAVES = ["servo-mac1", "servo-mac2", "servo-mac3"]
ANDROID_SLAVES = ["servo-linux-android1"]

@@ -51,7 +52,7 @@ def make_user_data(s):
return "\n".join(lines)

c['slaves'] = []
for s in MAC_SLAVES + ANDROID_SLAVES + HEAD_SLAVES:
for s in MAC_SLAVES + ANDROID_SLAVES + HEAD_SLAVES + LINUX_LINODE_SLAVES:
c['slaves'].append(buildslave.BuildSlave(s, SLAVE_PASSWORD, max_builds=1))
for s in LINUX_SLAVES:
c['slaves'].append(buildslave.EC2LatentBuildSlave(
@@ -311,14 +312,14 @@ def branch_priority(builder, requests):
c['builders'] = []
c['builders'].append(util.BuilderConfig(
name="linux-dev",
slavenames=LINUX_SLAVES,
slavenames=LINUX_SLAVES + LINUX_LINODE_SLAVES,
factory=linux_dev_factory,
nextBuild=branch_priority,
category="auto",
))
c['builders'].append(util.BuilderConfig(
name="linux-rel",
slavenames=LINUX_SLAVES,
slavenames=LINUX_SLAVES + LINUX_LINODE_SLAVES,
factory=linux_rel_factory,
nextBuild=branch_priority,
category="auto",
@@ -374,7 +375,7 @@ c['builders'].append(util.BuilderConfig(
))
c['builders'].append(util.BuilderConfig(
name="cargo-linux",
slavenames=LINUX_SLAVES,
slavenames=LINUX_SLAVES + LINUX_LINODE_SLAVES,
factory=cargo_linux_factory,
nextBuild=branch_priority,
category="cargo_auto"
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.