Skip to content

GitLab

T
tangled
Commit a2226a6c authored by John Abd-El-Malek's avatar John Abd-El-Malek
Browse files
Options

Convert manually triggered try runs to use bots without _swarming prefix. 

BUG=425813
R=phajdan.jr@chromium.org

Review URL: https://codereview.chromium.org/664413006

Cr-Commit-Position: refs/heads/master@{#300691}
parent e1c0f12d
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 42 deletions
PRESUBMIT.py
View file @ a2226a6c
......@@ -1614,22 +1614,22 @@ def GetDefaultTryConfigs(bots=None):
'linux_gtk': standard_tests,
'linux_chromeos_asan': ['compile'],
'linux_chromium_chromeos_clang_dbg': ['defaulttests'],
'linux_chromium_chromeos_rel_swarming': ['defaulttests'],
'linux_chromium_chromeos_rel': ['defaulttests'],
'linux_chromium_compile_dbg': ['defaulttests'],
'linux_chromium_gn_dbg': ['compile'],
'linux_chromium_gn_rel': ['defaulttests'],
'linux_chromium_rel_swarming': ['defaulttests'],
'linux_chromium_rel': ['defaulttests'],
'linux_chromium_clang_dbg': ['defaulttests'],
'linux_gpu': ['defaulttests'],
'linux_nacl_sdk_build': ['compile'],
'mac_chromium_compile_dbg': ['defaulttests'],
'mac_chromium_rel_swarming': ['defaulttests'],
'mac_chromium_rel': ['defaulttests'],
'mac_gpu': ['defaulttests'],
'mac_nacl_sdk_build': ['compile'],
'win_chromium_compile_dbg': ['defaulttests'],
'win_chromium_dbg': ['defaulttests'],
'win_chromium_rel_swarming': ['defaulttests'],
'win_chromium_x64_rel_swarming': ['defaulttests'],
'win_chromium_rel': ['defaulttests'],
'win_chromium_x64_rel': ['defaulttests'],
'win_gpu': ['defaulttests'],
'win_nacl_sdk_build': ['compile'],
'win8_chromium_rel': ['defaulttests'],
......@@ -1679,12 +1679,12 @@ def GetPreferredTryMasters(project, change):
if all(re.search(r'\.(m|mm)$|(^|[\\\/_])mac[\\\/_.]', f) for f in files):
return GetDefaultTryConfigs([
'mac_chromium_compile_dbg',
'mac_chromium_rel_swarming',
'mac_chromium_rel',
])
if all(re.search('(^|[/_])win[/_.]', f) for f in files):
return GetDefaultTryConfigs([
'win_chromium_dbg',
'win_chromium_rel_swarming',
'win_chromium_rel',
'win8_chromium_rel',
])
if all(re.search(r'(^|[\\\/_])android[\\\/_.]', f) for f in files):
......@@ -1706,18 +1706,18 @@ def GetPreferredTryMasters(project, change):
'ios_dbg_simulator',
'ios_rel_device',
'ios_rel_device_ninja',
'linux_chromium_chromeos_rel_swarming',
'linux_chromium_chromeos_rel',
'linux_chromium_clang_dbg',
'linux_chromium_gn_dbg',
'linux_chromium_gn_rel',
'linux_chromium_rel_swarming',
'linux_chromium_rel',
'linux_gpu',
'mac_chromium_compile_dbg',
'mac_chromium_rel_swarming',
'mac_chromium_rel',
'mac_gpu',
'win_chromium_compile_dbg',
'win_chromium_rel_swarming',
'win_chromium_x64_rel_swarming',
'win_chromium_rel',
'win_chromium_x64_rel',
'win_gpu',
'win8_chromium_rel',
]
......
PRESUBMIT_test.py
View file @ a2226a6c
......@@ -691,7 +691,6 @@ class TryServerMasterTest(unittest.TestCase):
'mac_chromium_compile_rel',
'mac_chromium_dbg',
'mac_chromium_rel',
'mac_chromium_rel_swarming',
'mac_nacl_sdk',
'mac_nacl_sdk_build',
'mac_rel_naclmore',
......@@ -734,7 +733,6 @@ class TryServerMasterTest(unittest.TestCase):
'linux_chromium_gn_dbg',
'linux_chromium_gn_rel',
'linux_chromium_rel',
'linux_chromium_rel_swarming',
'linux_chromium_trusty32_dbg',
'linux_chromium_trusty32_rel',
'linux_chromium_trusty_dbg',
......@@ -764,8 +762,6 @@ class TryServerMasterTest(unittest.TestCase):
'win_chromium_dbg',
'win_chromium_rel',
'win_chromium_rel',
'win_chromium_rel_swarming',
'win_chromium_rel_swarming',
'win_chromium_x64_dbg',
'win_chromium_x64_rel',
'win_drmemory',
......
base/PRESUBMIT.py
View file @ a2226a6c
......@@ -51,12 +51,12 @@ def CheckChangeOnCommit(input_api, output_api):
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium.linux': {
'linux_chromium_rel_swarming': set(['defaulttests']),
'linux_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.mac': {
'mac_chromium_rel_swarming': set(['defaulttests']),
'mac_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.win': {
'win_chromium_rel_swarming': set(['defaulttests']),
'win_chromium_rel': set(['defaulttests']),
}
}
chrome/browser/policy/PRESUBMIT.py
View file @ a2226a6c
......@@ -11,7 +11,7 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium.linux': {
'linux_chromium_chromeos_rel_swarming': set(['defaulttests']),
'linux_chromium_chromeos_rel': set(['defaulttests']),
'linux_chromium_chromeos_clang_dbg': set(['defaulttests']),
}
}
chrome/browser/sync/PRESUBMIT.py
View file @ a2226a6c
......@@ -11,12 +11,12 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium.linux': {
'linux_chromium_rel_swarming': set(['defaulttests']),
'linux_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.mac': {
'mac_chromium_rel_swarming': set(['defaulttests']),
'mac_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.win': {
'win_chromium_rel_swarming': set(['defaulttests']),
'win_chromium_rel': set(['defaulttests']),
}
}
chrome/browser/ui/libgtk2ui/PRESUBMIT.py
View file @ a2226a6c
......@@ -13,6 +13,6 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium.linux': {
'linux_chromium_rel_swarming': set(['defaulttests']),
'linux_chromium_rel': set(['defaulttests']),
}
}
chrome/browser/ui/views/PRESUBMIT.py
View file @ a2226a6c
......@@ -11,6 +11,6 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium.linux': {
'linux_chromium_chromeos_rel_swarming': set(['defaulttests']),
'linux_chromium_chromeos_rel': set(['defaulttests']),
}
}
chrome/browser/ui/webui/PRESUBMIT.py
View file @ a2226a6c
......@@ -11,6 +11,6 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium.linux': {
'linux_chromium_chromeos_rel_swarming': set(['defaulttests']),
'linux_chromium_chromeos_rel': set(['defaulttests']),
}
}
chrome/common/net/PRESUBMIT.py
View file @ a2226a6c
......@@ -11,12 +11,12 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium.linux': {
'linux_chromium_rel_swarming': set(['defaulttests']),
'linux_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.mac': {
'mac_chromium_rel_swarming': set(['defaulttests']),
'mac_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.win': {
'win_chromium_rel_swarming': set(['defaulttests']),
'win_chromium_rel': set(['defaulttests']),
}
}
extensions/browser/PRESUBMIT.py
View file @ a2226a6c
......@@ -13,7 +13,7 @@ import sys
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium.linux': {
'linux_chromium_chromeos_rel_swarming': set(['defaulttests']),
'linux_chromium_chromeos_rel': set(['defaulttests']),
}
}
......
jingle/PRESUBMIT.py
View file @ a2226a6c
......@@ -11,12 +11,12 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium.linux': {
'linux_chromium_rel_swarming': set(['defaulttests']),
'linux_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.mac': {
'mac_chromium_rel_swarming': set(['defaulttests']),
'mac_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.win': {
'win_chromium_rel_swarming': set(['defaulttests']),
'win_chromium_rel': set(['defaulttests']),
}
}
net/PRESUBMIT.py
View file @ a2226a6c
......@@ -11,13 +11,13 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
masters = {
'tryserver.chromium.linux': {
'linux_chromium_rel_swarming': set(['defaulttests']),
'linux_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.mac': {
'mac_chromium_rel_swarming': set(['defaulttests']),
'mac_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.win': {
'win_chromium_rel_swarming': set(['defaulttests']),
'win_chromium_rel': set(['defaulttests']),
}
}
# Changes that touch NSS files will likely need a corresponding OpenSSL edit.
......
sync/PRESUBMIT.py
View file @ a2226a6c
......@@ -11,10 +11,10 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium.linux': {
'linux_chromium_rel_swarming': set(['defaulttests']),
'linux_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.mac': {
'mac_chromium_rel_swarming': set(['defaulttests']),
'mac_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.win': {
'win_chromium_rel': set(['defaulttests']),
......
ui/compositor/PRESUBMIT.py
View file @ a2226a6c
......@@ -11,6 +11,6 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium.linux': {
'linux_chromium_chromeos_rel_swarming': set(['defaulttests']),
'linux_chromium_chromeos_rel': set(['defaulttests']),
}
}
ui/events/PRESUBMIT.py
View file @ a2226a6c
......@@ -17,12 +17,12 @@ def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium.linux': {
'linux_chromium_rel_swarming': tests,
'linux_chromium_chromeos_rel_swarming': tests,
'linux_chromium_rel': tests,
'linux_chromium_chromeos_rel': tests,
'linux_chromeos_asan': tests,
},
'tryserver.chromium.win': {
'win_chromium_compile_dbg': tests,
'win_chromium_rel_swarming': tests,
'win_chromium_rel': tests,
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment