From 56b8c95b759d67e856fe6fe4a289558413268bd7 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Wed, 11 Jul 2018 21:23:09 +0200
Subject: [PATCH 1/2] Fix /dev/kvm permissions on linux-kvm builders

---
 common/init.sls                  |  6 ------
 servo-build-dependencies/kvm.sls | 14 ++++++++++++++
 top.sls                          |  1 +
 3 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 servo-build-dependencies/kvm.sls

diff --git a/common/init.sls b/common/init.sls
index 4fca07a7..fccc2436 100644
--- a/common/init.sls
+++ b/common/init.sls
@@ -1,13 +1,7 @@
 {% from tpldir ~ '/map.jinja' import common %}
 
-kvm:
-  group.present:
-    - system: True
-
 servo:
   user.present:
     - fullname: Tom Servo
     - shell: /bin/bash
     - home: {{ common.servo_home }}
-    - groups:
-      - kvm
diff --git a/servo-build-dependencies/kvm.sls b/servo-build-dependencies/kvm.sls
new file mode 100644
index 00000000..a4eb83a2
--- /dev/null
+++ b/servo-build-dependencies/kvm.sls
@@ -0,0 +1,14 @@
+kvm-dependencies:
+  pkg.installed:
+    - pkgs:
+      # We don’t actually use the contents of this package,
+      # installing it makes /dev/kvm be usable by the 'kvm' Unix group
+      # (and makes that group exist).
+      - libvirt-bin
+
+kvm-group:
+  user.present:
+    - require:
+      - pkg: kvm-dependencies
+    - groups:
+      - kvm
diff --git a/top.sls b/top.sls
index 6859c071..b03d3c35 100644
--- a/top.sls
+++ b/top.sls
@@ -24,6 +24,7 @@ base:
     - match: pcre
     - buildbot.slave
     - servo-build-dependencies
+    - servo-build-dependencies.kvm
     - servo-build-dependencies.java
     - servo-build-dependencies.ci
 

From c5fe5fa9946c8993a30e9a30e8b1599eba6b7282 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Wed, 11 Jul 2018 21:24:37 +0200
Subject: [PATCH 2/2] Add the android-x86 build job

CC https://github.com/servo/servo/issues/21124
---
 buildbot/master/files/config/master.cfg | 3 +++
 homu/files/cfg.toml                     | 2 ++
 ubuntu/files/remove-build-directories   | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/buildbot/master/files/config/master.cfg b/buildbot/master/files/config/master.cfg
index 7b8a33fc..c2e3de0e 100644
--- a/buildbot/master/files/config/master.cfg
+++ b/buildbot/master/files/config/master.cfg
@@ -67,6 +67,7 @@ c['schedulers'].append(schedulers.AnyBranchScheduler(
     treeStableTimer=None,
     builderNames=[
         "android",
+        "android-x86",
         "arm32",
         "arm64",
         "linux-dev",
@@ -94,6 +95,7 @@ c['schedulers'].append(schedulers.ForceScheduler(
     name="force",
     builderNames=[
         "android",
+        "android-x86",
         "android-nightly",
         "arm32",
         "arm64",
@@ -167,6 +169,7 @@ class DynamicServoBuilder(util.BuilderConfig):
 
 c['builders'] = [
     DynamicServoBuilder("android", CROSS_SLAVES, envs.build_android),
+    DynamicServoBuilder("android-x86", KVM_SLAVES, envs.build_android),
     DynamicServoBuilder("android-nightly", CROSS_SLAVES, envs.build_android),
     DynamicServoBuilder("arm32", CROSS_SLAVES, envs.build_arm32),
     DynamicServoBuilder("arm64", CROSS_SLAVES, envs.build_arm64),
diff --git a/homu/files/cfg.toml b/homu/files/cfg.toml
index bdff592d..87cdfa0e 100644
--- a/homu/files/cfg.toml
+++ b/homu/files/cfg.toml
@@ -212,6 +212,7 @@ builders = [
     "mac-rel-css1",
     "mac-rel-css2",
     "android",
+    "android-x86",
     "arm32",
     "arm64",
     "windows-msvc-dev",
@@ -228,6 +229,7 @@ try_builders = [
     "mac-rel-css1",
     "mac-rel-css2",
     "android",
+    "android-x86",
     "arm32",
     "arm64",
     "windows-msvc-dev",
diff --git a/ubuntu/files/remove-build-directories b/ubuntu/files/remove-build-directories
index 07f89a34..0eeae30c 100644
--- a/ubuntu/files/remove-build-directories
+++ b/ubuntu/files/remove-build-directories
@@ -4,7 +4,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-declare -a builders=("android" "linux-dev" "linux-nightly" "linux-rel-css"
+declare -a builders=("android" "android-x86" "linux-dev" "linux-nightly" "linux-rel-css"
                      "linux-rel-intermittent" "linux-rel-nogate"
                      "linux-rel-wpt" "android-nightly" "arm32" "arm64")
 
@@ -16,4 +16,4 @@ do
   do
     rm -rf "/home/servo/buildbot/slave/${builder}/build/target/${target}"
   done
-done
\ No newline at end of file
+done