From ce5195398a35a27e5074654e61f0b5ae222741f7 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Thu, 7 Aug 2014 15:43:24 +0000 Subject: [PATCH] Update manually triggered try jobs to use swarming for ChromeOS and Mac since they're switched by CQ already. TBR=ben Review URL: https://codereview.chromium.org/450583002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288050 0039d316-1c4b-4281-b951-d872f2087c98 --- PRESUBMIT.py | 4 ++-- base/PRESUBMIT.py | 2 +- chrome/browser/policy/PRESUBMIT.py | 2 +- chrome/browser/sync/PRESUBMIT.py | 2 +- chrome/browser/ui/views/PRESUBMIT.py | 2 +- chrome/browser/ui/webui/PRESUBMIT.py | 2 +- chrome/common/net/PRESUBMIT.py | 2 +- extensions/browser/PRESUBMIT.py | 2 +- jingle/PRESUBMIT.py | 2 +- net/PRESUBMIT.py | 2 +- sync/PRESUBMIT.py | 2 +- ui/compositor/PRESUBMIT.py | 2 +- ui/events/PRESUBMIT.py | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 8d86eecca3f06..60272f4b7ad35 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -1509,7 +1509,7 @@ def GetDefaultTryConfigs(bots=None): 'linux_gtk': standard_tests, 'linux_chromeos_asan': ['compile'], 'linux_chromium_chromeos_clang_dbg': ['defaulttests'], - 'linux_chromium_chromeos_rel': ['defaulttests'], + 'linux_chromium_chromeos_rel_swarming': ['defaulttests'], 'linux_chromium_compile_dbg': ['defaulttests'], 'linux_chromium_gn_rel': ['defaulttests'], 'linux_chromium_rel_swarming': ['defaulttests'], @@ -1517,7 +1517,7 @@ def GetDefaultTryConfigs(bots=None): 'linux_gpu': ['defaulttests'], 'linux_nacl_sdk_build': ['compile'], 'mac_chromium_compile_dbg': ['defaulttests'], - 'mac_chromium_rel': ['defaulttests'], + 'mac_chromium_rel_swarming': ['defaulttests'], 'mac_gpu': ['defaulttests'], 'mac_nacl_sdk_build': ['compile'], 'win_chromium_compile_dbg': ['defaulttests'], diff --git a/base/PRESUBMIT.py b/base/PRESUBMIT.py index 931f94ae95418..913aa4f8648a9 100644 --- a/base/PRESUBMIT.py +++ b/base/PRESUBMIT.py @@ -54,7 +54,7 @@ def GetPreferredTryMasters(project, change): 'linux_chromium_rel_swarming': set(['defaulttests']), }, 'tryserver.chromium.mac': { - 'mac_chromium_rel': set(['defaulttests']), + 'mac_chromium_rel_swarming': set(['defaulttests']), }, 'tryserver.chromium.win': { 'win_chromium_rel': set(['defaulttests']), diff --git a/chrome/browser/policy/PRESUBMIT.py b/chrome/browser/policy/PRESUBMIT.py index ea93f85a5d894..0de11cae1b1a4 100644 --- a/chrome/browser/policy/PRESUBMIT.py +++ b/chrome/browser/policy/PRESUBMIT.py @@ -11,7 +11,7 @@ def GetPreferredTryMasters(project, change): return { 'tryserver.chromium.linux': { - 'linux_chromium_chromeos_rel': set(['defaulttests']), + 'linux_chromium_chromeos_rel_swarming': set(['defaulttests']), 'linux_chromium_chromeos_clang_dbg': set(['defaulttests']), } } diff --git a/chrome/browser/sync/PRESUBMIT.py b/chrome/browser/sync/PRESUBMIT.py index 137ad33046ec7..9cb0174762d68 100644 --- a/chrome/browser/sync/PRESUBMIT.py +++ b/chrome/browser/sync/PRESUBMIT.py @@ -14,7 +14,7 @@ def GetPreferredTryMasters(project, change): 'linux_chromium_rel_swarming': set(['defaulttests']), }, 'tryserver.chromium.mac': { - 'mac_chromium_rel': set(['defaulttests']), + 'mac_chromium_rel_swarming': set(['defaulttests']), }, 'tryserver.chromium.win': { 'win_chromium_rel': set(['defaulttests']), diff --git a/chrome/browser/ui/views/PRESUBMIT.py b/chrome/browser/ui/views/PRESUBMIT.py index 49c28bed7e85e..7313069a705d0 100644 --- a/chrome/browser/ui/views/PRESUBMIT.py +++ b/chrome/browser/ui/views/PRESUBMIT.py @@ -11,6 +11,6 @@ def GetPreferredTryMasters(project, change): return { 'tryserver.chromium.linux': { - 'linux_chromium_chromeos_rel': set(['defaulttests']), + 'linux_chromium_chromeos_rel_swarming': set(['defaulttests']), } } diff --git a/chrome/browser/ui/webui/PRESUBMIT.py b/chrome/browser/ui/webui/PRESUBMIT.py index ca679234268e9..37e0c8c5e4661 100644 --- a/chrome/browser/ui/webui/PRESUBMIT.py +++ b/chrome/browser/ui/webui/PRESUBMIT.py @@ -11,6 +11,6 @@ def GetPreferredTryMasters(project, change): return { 'tryserver.chromium.linux': { - 'linux_chromium_chromeos_rel': set(['defaulttests']), + 'linux_chromium_chromeos_rel_swarming': set(['defaulttests']), } } diff --git a/chrome/common/net/PRESUBMIT.py b/chrome/common/net/PRESUBMIT.py index f5ec5c1dac360..19649722e7351 100644 --- a/chrome/common/net/PRESUBMIT.py +++ b/chrome/common/net/PRESUBMIT.py @@ -14,7 +14,7 @@ def GetPreferredTryMasters(project, change): 'linux_chromium_rel_swarming': set(['defaulttests']), }, 'tryserver.chromium.mac': { - 'mac_chromium_rel': set(['defaulttests']), + 'mac_chromium_rel_swarming': set(['defaulttests']), }, 'tryserver.chromium.win': { 'win_chromium_rel': set(['defaulttests']), diff --git a/extensions/browser/PRESUBMIT.py b/extensions/browser/PRESUBMIT.py index 689b8ad373aa8..7c237f6718c0f 100644 --- a/extensions/browser/PRESUBMIT.py +++ b/extensions/browser/PRESUBMIT.py @@ -13,7 +13,7 @@ def GetPreferredTryMasters(project, change): return { 'tryserver.chromium.linux': { - 'linux_chromium_chromeos_rel': set(['defaulttests']), + 'linux_chromium_chromeos_rel_swarming': set(['defaulttests']), } } diff --git a/jingle/PRESUBMIT.py b/jingle/PRESUBMIT.py index efa2c486412cf..b356edc6deaa9 100644 --- a/jingle/PRESUBMIT.py +++ b/jingle/PRESUBMIT.py @@ -14,7 +14,7 @@ def GetPreferredTryMasters(project, change): 'linux_chromium_rel_swarming': set(['defaulttests']), }, 'tryserver.chromium.mac': { - 'mac_chromium_rel': set(['defaulttests']), + 'mac_chromium_rel_swarming': set(['defaulttests']), }, 'tryserver.chromium.win': { 'win_chromium_rel': set(['defaulttests']), diff --git a/net/PRESUBMIT.py b/net/PRESUBMIT.py index 55fa983b0d6d5..3b830b7aea6f9 100644 --- a/net/PRESUBMIT.py +++ b/net/PRESUBMIT.py @@ -14,7 +14,7 @@ def GetPreferredTryMasters(project, change): 'linux_chromium_rel_swarming': set(['defaulttests']), }, 'tryserver.chromium.mac': { - 'mac_chromium_rel': set(['defaulttests']), + 'mac_chromium_rel_swarming': set(['defaulttests']), }, 'tryserver.chromium.win': { 'win_chromium_rel': set(['defaulttests']), diff --git a/sync/PRESUBMIT.py b/sync/PRESUBMIT.py index 53c8d45e79598..87d68b4c7bc05 100644 --- a/sync/PRESUBMIT.py +++ b/sync/PRESUBMIT.py @@ -14,7 +14,7 @@ def GetPreferredTryMasters(project, change): 'linux_chromium_rel_swarming': set(['defaulttests']), }, 'tryserver.chromium.mac': { - 'mac_chromium_rel': set(['defaulttests']), + 'mac_chromium_rel_swarming': set(['defaulttests']), }, 'tryserver.chromium.win': { 'win_chromium_rel': set(['defaulttests']), diff --git a/ui/compositor/PRESUBMIT.py b/ui/compositor/PRESUBMIT.py index 6bc103cc47145..405f8ce1bfb3b 100644 --- a/ui/compositor/PRESUBMIT.py +++ b/ui/compositor/PRESUBMIT.py @@ -11,6 +11,6 @@ def GetPreferredTryMasters(project, change): return { 'tryserver.chromium.linux': { - 'linux_chromium_chromeos_rel': set(['defaulttests']), + 'linux_chromium_chromeos_rel_swarming': set(['defaulttests']), } } diff --git a/ui/events/PRESUBMIT.py b/ui/events/PRESUBMIT.py index b6284624e166d..532c187d0b175 100644 --- a/ui/events/PRESUBMIT.py +++ b/ui/events/PRESUBMIT.py @@ -18,7 +18,7 @@ def GetPreferredTryMasters(project, change): return { 'tryserver.chromium.linux': { 'linux_chromium_rel_swarming': tests, - 'linux_chromium_chromeos_rel': tests, + 'linux_chromium_chromeos_rel_swarming': tests, 'linux_chromeos_asan': tests, }, 'tryserver.chromium.win': {