Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(411)

Unified Diff: scripts/slave/recipes/webrtc/baremetal.py

Issue 177553005: Updates to WebRTC Baremetal recipe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Use Chromium's SVN mirror for WebRTC when run in Chrome infra. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/webrtc/baremetal.py
diff --git a/scripts/slave/recipes/webrtc/baremetal.py b/scripts/slave/recipes/webrtc/baremetal.py
index 5159e4704d50b73824ca600ee451114ab8fe74d2..0e56ac6aef27cb7da27fe551aa69fc4e5996637e 100644
--- a/scripts/slave/recipes/webrtc/baremetal.py
+++ b/scripts/slave/recipes/webrtc/baremetal.py
@@ -5,11 +5,8 @@
DEPS = [
'chromium',
'gclient',
- 'path',
'platform',
'properties',
- 'python',
- 'step',
'tryserver',
'webrtc',
]
@@ -21,7 +18,6 @@ def GenSteps(api):
dict((str(k),v) for k,v in api.properties.iteritems() if k.isupper())
)
api.webrtc.set_config('webrtc_standalone', **config_vals)
- api.step.auto_resolve_conflicts = True
yield api.gclient.checkout()
yield api.chromium.runhooks()
@@ -33,30 +29,32 @@ def GenSteps(api):
def GenTests(api):
- for plat in ('win', 'mac', 'linux'):
- for bits in (32, 64):
- for build_config in ('Debug', 'Release'):
- yield (
- api.test('buildbot_%s%s_%s' % (plat, bits, build_config)) +
- api.properties(BUILD_CONFIG=build_config,
- TARGET_BITS=bits,
- buildername='buildbot builder',
- slavename='slavename',
- mastername='mastername') +
- api.platform(plat, bits)
- )
-
- for plat in ('win', 'mac', 'linux'):
- for bits in (32, 64):
- for build_config in ('Debug', 'Release'):
- yield (
- api.test('trybot_%s%s_%s' % (plat, bits, build_config)) +
- api.properties(BUILD_CONFIG=build_config,
+
+ def props(build_config, bits, buildername, revision=None, patch_url=None):
+ return api.properties(BUILD_CONFIG=build_config,
TARGET_BITS=bits,
- buildername='trybot builder',
+ buildername=buildername,
slavename='slavename',
mastername='mastername',
- revision='12345',
- patch_url='try_job_svn_patch') +
- api.platform(plat, bits)
- )
+ revision=revision,
+ patch_url=patch_url)
+
+ for kind in ['buildbot', 'trybot']:
+ revision = '12345' if kind == 'trybot' else None
+ patch_url = 'try_job_svn_patch' if kind == 'trybot' else None
+
+ yield (
+ api.test('%s_win32_Release' % kind) +
+ props('Release', 32, kind, revision=revision, patch_url=patch_url) +
+ api.platform('win', 64)
+ )
+ yield (
+ api.test('%s_mac32_Release' % kind) +
+ props('Release', 32, kind, revision=revision, patch_url=patch_url) +
+ api.platform('mac', 64)
+ )
+ yield (
+ api.test('%s_linux64_Release' % kind) +
+ props('Release', 64, kind, revision=revision, patch_url=patch_url) +
+ api.platform('linux', 64)
+ )

Powered by Google App Engine
This is Rietveld 408576698