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

Side by Side Diff: scripts/slave/recipes/nacl.py

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge Created 4 years, 8 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 | Annotate | Revision Log
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 DEPS = [ 5 DEPS = [
6 'depot_tools/bot_update', 6 'depot_tools/bot_update',
7 'depot_tools/gclient', 7 'depot_tools/gclient',
8 'depot_tools/infra_paths',
8 'recipe_engine/path', 9 'recipe_engine/path',
9 'recipe_engine/platform', 10 'recipe_engine/platform',
10 'recipe_engine/properties', 11 'recipe_engine/properties',
11 'recipe_engine/python', 12 'recipe_engine/python',
12 'recipe_engine/step', 13 'recipe_engine/step',
13 'trigger', 14 'trigger',
14 ] 15 ]
15 16
16 # Maps from triggering builder to triggered builder; 17 # Maps from triggering builder to triggered builder;
17 # key builder triggers value builder. 18 # key builder triggers value builder.
(...skipping 22 matching lines...) Expand all
40 api.gclient.runhooks() 41 api.gclient.runhooks()
41 return got_revision 42 return got_revision
42 43
43 def _AnnotatedStepsSteps(api, got_revision): 44 def _AnnotatedStepsSteps(api, got_revision):
44 # Default environemnt; required by all builders. 45 # Default environemnt; required by all builders.
45 env = { 46 env = {
46 'BUILDBOT_MASTERNAME': api.properties['mastername'], 47 'BUILDBOT_MASTERNAME': api.properties['mastername'],
47 'BUILDBOT_BUILDERNAME': api.properties['buildername'], 48 'BUILDBOT_BUILDERNAME': api.properties['buildername'],
48 'BUILDBOT_REVISION': api.properties['revision'], 49 'BUILDBOT_REVISION': api.properties['revision'],
49 'BUILDBOT_GOT_REVISION': got_revision, 50 'BUILDBOT_GOT_REVISION': got_revision,
50 'RUNTEST': api.path['build'].join('scripts', 'slave', 'runtest.py'), 51 'RUNTEST': api.infra_paths['build'].join('scripts', 'slave', 'runtest.py') ,
51 'BUILDBOT_SLAVE_TYPE': api.properties['slavetype'], 52 'BUILDBOT_SLAVE_TYPE': api.properties['slavetype'],
52 } 53 }
53 # Set up env for the triggered builders. 54 # Set up env for the triggered builders.
54 if api.properties['buildername'] in trigger_map.values(): 55 if api.properties['buildername'] in trigger_map.values():
55 env.update({ 56 env.update({
56 'BUILDBOT_TRIGGERED_BY_BUILDERNAME': 57 'BUILDBOT_TRIGGERED_BY_BUILDERNAME':
57 api.properties['parent_buildername'], 58 api.properties['parent_buildername'],
58 'BUILDBOT_TRIGGERED_BY_BUILDNUMBER': 59 'BUILDBOT_TRIGGERED_BY_BUILDNUMBER':
59 api.properties['parent_buildnumber'], 60 api.properties['parent_buildnumber'],
60 'BUILDBOT_TRIGGERED_BY_SLAVENAME': 61 'BUILDBOT_TRIGGERED_BY_SLAVENAME':
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 mastername = 'client.nacl', 99 mastername = 'client.nacl',
99 buildername = 'oneiric_32-newlib-arm_hw-pnacl-panda-dbg', 100 buildername = 'oneiric_32-newlib-arm_hw-pnacl-panda-dbg',
100 revision = 'abcd', 101 revision = 'abcd',
101 slavename='TestSlave', 102 slavename='TestSlave',
102 buildnumber = 5678, 103 buildnumber = 5678,
103 parent_slavename = 'TestSlave', 104 parent_slavename = 'TestSlave',
104 parent_buildername = 'precise_64-newlib-arm_qemu-pnacl-dbg', 105 parent_buildername = 'precise_64-newlib-arm_qemu-pnacl-dbg',
105 parent_buildnumber = 1, 106 parent_buildnumber = 1,
106 slavetype = 'BuilderTester', 107 slavetype = 'BuilderTester',
107 )) 108 ))
OLDNEW
« no previous file with comments | « scripts/slave/recipes/mojo.expected/mojo_win_dbg.json ('k') | scripts/slave/recipes/nacl.expected/linux_triggered.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698