| Index: masters/master.client.dart.fyi/slaves.cfg
|
| diff --git a/masters/master.client.dart.fyi/slaves.cfg b/masters/master.client.dart.fyi/slaves.cfg
|
| index 46d235f74af40bc76ba293040e96f981e23c1649..7d095445e70149b440f6f120ff2c98baaa3d8167 100644
|
| --- a/masters/master.client.dart.fyi/slaves.cfg
|
| +++ b/masters/master.client.dart.fyi/slaves.cfg
|
| @@ -13,7 +13,7 @@ slaves = [
|
| 'builder': ['dart2js-linux-debug-checked-host-checked'],
|
| 'hostname': 'slave128-c3',
|
| 'os': 'linux',
|
| - 'version': 'precise',
|
| + 'version': 'trusty',
|
| 'bits': '64',
|
| },
|
| {
|
| @@ -21,7 +21,7 @@ slaves = [
|
| 'builder': ['dart2js-linux-debug-host-checked'],
|
| 'hostname': 'slave100-c3',
|
| 'os': 'linux',
|
| - 'version': 'precise',
|
| + 'version': 'trusty',
|
| 'bits': '64',
|
| },
|
| {
|
| @@ -32,18 +32,16 @@ slaves = [
|
| 'dart2js-linux-chromeff'],
|
| 'hostname': 'slave130-c3',
|
| 'os': 'linux',
|
| - 'version': 'precise',
|
| + 'version': 'trusty',
|
| 'bits': '64',
|
| },
|
| - # This machine has specialized setup - please don't move the slave without
|
| - # pinging ricow@
|
| {
|
| 'master': 'DartFYI',
|
| 'builder': ['dart2js-linux-release-host-checked',
|
| 'dart2js-linux-release-checked-host-checked'],
|
| 'hostname': 'slave99-c3',
|
| 'os': 'linux',
|
| - 'version': 'precise',
|
| + 'version': 'trusty',
|
| 'bits': '64',
|
| },
|
| {
|
| @@ -59,7 +57,7 @@ slaves = [
|
| 'builder': ['dart2js-chromeOnAndroid-linux'],
|
| 'hostname': 'slave127-c3',
|
| 'os': 'linux',
|
| - 'version': 'precise',
|
| + 'version': 'trusty',
|
| 'bits': '64',
|
| },
|
| {
|
| @@ -67,11 +65,10 @@ slaves = [
|
| 'builder': ['vm-android-linux',
|
| 'v8-linux-release',
|
| 'dart2js-linux-release',
|
| - 'dart2js-linux-release-checked-host-checked-x64',
|
| - 'dartium-lucid64-debug-dev',],
|
| + 'dart2js-linux-release-checked-host-checked-x64'],
|
| 'hostname': 'slave131-c3',
|
| 'os': 'linux',
|
| - 'version': 'precise',
|
| + 'version': 'trusty',
|
| 'bits': '64',
|
| },
|
| {
|
| @@ -109,34 +106,7 @@ slaves = [
|
| },
|
| {
|
| 'master': 'DartFYI',
|
| - 'builder': ['dartium-mac-debug'],
|
| - 'hostname': 'vm608-m3',
|
| - 'os': 'mac',
|
| - 'version': '10.7',
|
| - 'bits': '64'
|
| - },
|
| - {
|
| - 'master': 'DartFYI',
|
| - 'builder': ['dartium-lucid64-debug-be'],
|
| - 'hostname': 'slave101-c3',
|
| - 'os': 'linux',
|
| - 'version': 'precise',
|
| - 'bits': '64',
|
| - },
|
| - {
|
| - 'master': 'DartFYI',
|
| - 'builder': ['dartium-lucid64-debug-stable',
|
| - 'dartium-lucid64-debug-integration'],
|
| - 'hostname': 'slave129-c3',
|
| - 'os': 'linux',
|
| - 'version': 'precise',
|
| - 'bits': '64',
|
| - },
|
| - {
|
| - 'master': 'DartFYI',
|
| - 'builder': ['dartium-win-debug-be',
|
| - 'dartium-win-debug-stable',
|
| - 'dart2js-win7-ie10chrome'],
|
| + 'builder': ['dart2js-win7-ie10chrome'],
|
| 'hostname': 'vm112-m3',
|
| 'os': 'win',
|
| 'version': 'win7',
|
| @@ -144,23 +114,6 @@ slaves = [
|
| },
|
| {
|
| 'master': 'DartFYI',
|
| - 'builder': ['dartium-win-debug-integration',
|
| - 'dartium-win-debug-dev'],
|
| - 'hostname': 'vm192-m3',
|
| - 'os': 'win',
|
| - 'version': 'win7',
|
| - 'bits': '64',
|
| - },
|
| - {
|
| - 'master': 'DartFYI',
|
| - 'builder': ['dart-recipe'],
|
| - 'hostname': 'slave37-c3',
|
| - 'os': 'linux',
|
| - 'version': 'precise',
|
| - 'bits': '64',
|
| - },
|
| - {
|
| - 'master': 'DartFYI',
|
| 'builder': ['cross-mips-board-linux-release'],
|
| 'hostname': 'slave123-c3',
|
| 'os': 'linux',
|
| @@ -200,8 +153,7 @@ channel_postfixes = ['-be', '-dev', '-stable', '-integration']
|
|
|
| def valid_for_channel(builder, channel):
|
| """ Returns true if we have this builder on this specific channel"""
|
| - return channel != '-integration' or ('dartium' in builder and not
|
| - 'dartium-android-release' in builder)
|
| + return channel != '-integration'
|
|
|
| def is_channel_builder(builder):
|
| """Returns true if the builder name is already specific to a channel
|
|
|