From d1e377a0d3327132c6fa1d35d4ac642f7dd664db Mon Sep 17 00:00:00 2001 From: Alan Jeffrey Date: Mon, 5 Nov 2018 14:56:40 -0600 Subject: [PATCH 1/2] Add magicleap builders --- buildbot/master/files/config/master.cfg | 3 +++ homu/files/cfg.toml | 2 ++ homu/map.jinja | 1 + 3 files changed, 6 insertions(+) diff --git a/buildbot/master/files/config/master.cfg b/buildbot/master/files/config/master.cfg index 50e1c4ee..d5d3232d 100644 --- a/buildbot/master/files/config/master.cfg +++ b/buildbot/master/files/config/master.cfg @@ -89,6 +89,7 @@ c['schedulers'].append(schedulers.AnyBranchScheduler( "mac-rel-wpt2", "mac-rel-wpt3", "mac-rel-wpt4", + "magicleap", "windows-msvc-dev", ], change_filter=util.ChangeFilter(filter_fn=servo_auto_try_filter), @@ -135,6 +136,7 @@ c['schedulers'].append(schedulers.ForceScheduler( "mac-rel-wpt2", "mac-rel-wpt3", "mac-rel-wpt4", + "magicleap", "windows-msvc-dev", "windows-msvc-nightly", ], @@ -211,6 +213,7 @@ c['builders'] = [ DynamicServoBuilder("mac-rel-wpt2", MAC_SLAVES, envs.build_mac), DynamicServoBuilder("mac-rel-wpt3", MAC_SLAVES, envs.build_mac), DynamicServoBuilder("mac-rel-wpt4", MAC_SLAVES, envs.build_mac), + DynamicServoBuilder("magicleap", MAC_SLAVES, envs.build_mac), DynamicServoBuilder("windows-msvc-dev", WINDOWS_SLAVES, envs.build_windows_msvc), DynamicServoBuilder("windows-msvc-nightly", WINDOWS_SLAVES, diff --git a/homu/files/cfg.toml b/homu/files/cfg.toml index 0efac853..947ae778 100644 --- a/homu/files/cfg.toml +++ b/homu/files/cfg.toml @@ -218,6 +218,7 @@ builders = [ "android", "android-mac", "android-x86", + "magicleap", "arm32", "arm64", "windows-msvc-dev", @@ -236,6 +237,7 @@ try_builders = [ "android", "android-mac", "android-x86", + "magicleap", "arm32", "arm64", "windows-msvc-dev", diff --git a/homu/map.jinja b/homu/map.jinja index b14dd071..e8981422 100644 --- a/homu/map.jinja +++ b/homu/map.jinja @@ -8,6 +8,7 @@ 'windows': ['windows-msvc-dev'], 'wpt': ['linux-rel-css', 'linux-rel-wpt'], 'android': ['android', 'android-x86', 'android-mac'], + 'magicleap': ['magicleap'], 'arm': ['arm32', 'arm64'] } } From 5a0b3cfdf84dd180124213efbdde5eb36ceef47c Mon Sep 17 00:00:00 2001 From: Alan Jeffrey Date: Thu, 8 Nov 2018 10:39:34 -0600 Subject: [PATCH 2/2] Temporarily disable gating on magicleap --- homu/files/cfg.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/homu/files/cfg.toml b/homu/files/cfg.toml index 947ae778..fea079b4 100644 --- a/homu/files/cfg.toml +++ b/homu/files/cfg.toml @@ -218,7 +218,8 @@ builders = [ "android", "android-mac", "android-x86", - "magicleap", + # Do not gate on the magicleap build for now + # "magicleap", "arm32", "arm64", "windows-msvc-dev", @@ -237,7 +238,8 @@ try_builders = [ "android", "android-mac", "android-x86", - "magicleap", + # Do not gate on the magicleap build for now + # "magicleap", "arm32", "arm64", "windows-msvc-dev",