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

Side by Side Diff: scripts/slave/recipes/blimp/integration.py

Issue 2415963004: Fix compile on the Blimp Client Engine Integration bot (Closed)
Patch Set: Created 4 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 from recipe_engine import recipe_api 5 from recipe_engine import recipe_api
6 from recipe_engine.recipe_api import Property 6 from recipe_engine.recipe_api import Property
7 from recipe_engine.types import freeze 7 from recipe_engine.types import freeze
8 8
9 DEPS = [ 9 DEPS = [
10 'chromium', 10 'chromium',
(...skipping 21 matching lines...) Expand all
32 'gclient_apply_config': 'android', 32 'gclient_apply_config': 'android',
33 'gclient_config': 'chromium', 33 'gclient_config': 'chromium',
34 'target': 'Debug', 34 'target': 'Debug',
35 }, 35 },
36 }, 36 },
37 }) 37 })
38 38
39 REPO_URL = 'https://chromium.googlesource.com/chromium/src.git' 39 REPO_URL = 'https://chromium.googlesource.com/chromium/src.git'
40 40
41 def RunSteps(api): 41 def RunSteps(api):
42 android_build = api.path['slave_build'].join('src', 'out-android', 'Debug') 42 android_build = api.path['checkout'].join('src', 'out-android')
mikecase (-- gone --) 2016/10/14 02:25:36 need to change these paths to api.path['checkout']
shenghuazhang 2016/10/14 03:21:19 Done.
43 linux_build = api.path['slave_build'].join('src', 'out-linux', 'Debug') 43 linux_build = api.path['checkout'].join('src', 'out-linux')
44 mastername = api.properties.get('mastername') 44 mastername = api.properties.get('mastername')
45 buildername = api.properties.get('buildername') 45 buildername = api.properties.get('buildername')
46 builder = BUILDERS[mastername][buildername] 46 builder = BUILDERS[mastername][buildername]
47 api.chromium_android.configure_from_properties( 47 api.chromium_android.configure_from_properties(
48 builder['config'], 48 builder['config'],
49 REPO_NAME='src', 49 REPO_NAME='src',
50 REPO_URL=REPO_URL, 50 REPO_URL=REPO_URL,
51 INTERNAL=False, 51 INTERNAL=False,
52 BUILD_CONFIG=builder['target']) 52 BUILD_CONFIG=builder['target'])
53 53
54 api.chromium.set_config('chromium') 54 api.chromium.set_config('chromium')
mikecase (-- gone --) 2016/10/14 02:25:36 The fix you want is to delete this line. Looks lik
shenghuazhang 2016/10/14 03:21:18 Ohhh yes you are right... Or, maybe could call chr
55 api.gclient.set_config(builder['gclient_config']) 55 api.gclient.set_config(builder['gclient_config'])
56 api.gclient.apply_config(builder['gclient_apply_config']) 56 api.gclient.apply_config(builder['gclient_apply_config'])
57 api.bot_update.ensure_checkout() 57 api.bot_update.ensure_checkout()
58 api.chromium.ensure_goma() 58 api.chromium.ensure_goma()
59 api.chromium_android.clean_local_files() 59 api.chromium_android.clean_local_files()
60 api.chromium.runhooks() 60 api.chromium.runhooks()
61 61
62 api.chromium.run_mb(mastername=mastername, 62 api.chromium.run_mb(mastername=mastername,
63 buildername=buildername, 63 buildername=buildername,
64 build_dir=linux_build, 64 build_dir=linux_build,
65 phase='engine') 65 phase='engine')
66 api.chromium.compile(targets=['blimp'], 66 api.chromium.compile(targets=['blimp'],
67 target=builder['target'],
mikecase (-- gone --) 2016/10/14 02:25:36 you don't need to specify this explicitly. This do
shenghuazhang 2016/10/14 03:21:19 Done.
67 out_dir=linux_build) 68 out_dir=linux_build)
68 api.chromium.run_mb(mastername=mastername, 69 api.chromium.run_mb(mastername=mastername,
69 buildername=buildername, 70 buildername=buildername,
70 build_dir=android_build, 71 build_dir=android_build,
71 phase='client') 72 phase='client')
72 api.chromium.compile(targets=['blimp', 'chrome_public_apk'], 73 api.chromium.compile(targets=['blimp', 'chrome_public_apk'],
74 target=builder['target'],
73 out_dir=android_build) 75 out_dir=android_build)
74 76
75 77
76 def GenTests(api): 78 def GenTests(api):
77 sanitize = lambda s: ''.join(c if c.isalnum() else '_' for c in s) 79 sanitize = lambda s: ''.join(c if c.isalnum() else '_' for c in s)
78 80
79 yield ( 81 yield (
80 api.test('%s_test_pass' % sanitize('Blimp Android Tester')) + 82 api.test('%s_test_pass' % sanitize('Blimp Android Tester')) +
81 api.properties.generic( 83 api.properties.generic(
82 buildername='Blimp Client Engine Integration', 84 buildername='Blimp Client Engine Integration',
83 mastername='chromium.fyi') 85 mastername='chromium.fyi')
84 ) 86 )
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698