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

Side by Side Diff: recipe_engine/run.py

Issue 2426013002: Add Swarming magic environment variables to ENV_WHITELIST (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 | no next file » | 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 LUCI Authors. All rights reserved. 1 # Copyright 2016 The LUCI Authors. All rights reserved.
2 # Use of this source code is governed under the Apache License, Version 2.0 2 # Use of this source code is governed under the Apache License, Version 2.0
3 # that can be found in the LICENSE file. 3 # that can be found in the LICENSE file.
4 4
5 """Entry point for fully-annotated builds. 5 """Entry point for fully-annotated builds.
6 6
7 This script is part of the effort to move all builds to annotator-based 7 This script is part of the effort to move all builds to annotator-based
8 systems. Any builder configured to use the AnnotatorFactory.BaseFactory() 8 systems. Any builder configured to use the AnnotatorFactory.BaseFactory()
9 found in scripts/master/factory/annotator_factory.py executes a single 9 found in scripts/master/factory/annotator_factory.py executes a single
10 AddAnnotatedScript step. That step (found in annotator_commands.py) calls 10 AddAnnotatedScript step. That step (found in annotator_commands.py) calls
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 'BUILDBOT_REVISION', 94 'BUILDBOT_REVISION',
95 'BUILDBOT_SCHEDULER', 95 'BUILDBOT_SCHEDULER',
96 'BUILDBOT_SLAVENAME', 96 'BUILDBOT_SLAVENAME',
97 ]) 97 ])
98 98
99 ENV_WHITELIST_PYTHON = set([ 99 ENV_WHITELIST_PYTHON = set([
100 'PYTHONPATH', 100 'PYTHONPATH',
101 'PYTHONUNBUFFERED', 101 'PYTHONUNBUFFERED',
102 ]) 102 ])
103 103
104 ENV_WHITELIST_INFRA = ENV_WHITELIST_PYTHON | set([ 104 ENV_WHITELIST_SWARMING = set([
105 'SWARMING_BOT_ID',
106 'SWARMING_HEADLESS',
107 'SWARMING_TASK_ID',
108 ])
109
110 ENV_WHITELIST_INFRA = ENV_WHITELIST_PYTHON | ENV_WHITELIST_SWARMING | set([
105 'AWS_CREDENTIAL_FILE', 111 'AWS_CREDENTIAL_FILE',
106 'BOTO_CONFIG', 112 'BOTO_CONFIG',
107 'BUILDBOT_ARCHIVE_FORCE_SSH', 113 'BUILDBOT_ARCHIVE_FORCE_SSH',
108 'CHROME_HEADLESS', 114 'CHROME_HEADLESS',
109 'CHROMIUM_BUILD', 115 'CHROMIUM_BUILD',
110 'GIT_USER_AGENT', 116 'GIT_USER_AGENT',
111 'TESTING_MASTER', 117 'TESTING_MASTER',
112 'TESTING_MASTER_HOST', 118 'TESTING_MASTER_HOST',
113 'TESTING_SLAVENAME', 119 'TESTING_SLAVENAME',
114 ]) 120 ])
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 results.append( 496 results.append(
491 loader._invoke_with_properties( 497 loader._invoke_with_properties(
492 run_recipe, properties, recipe_script.PROPERTIES, 498 run_recipe, properties, recipe_script.PROPERTIES,
493 properties.keys())) 499 properties.keys()))
494 except TypeError as e: 500 except TypeError as e:
495 raise TypeError( 501 raise TypeError(
496 "Got %r while trying to call recipe %s with properties %r" % ( 502 "Got %r while trying to call recipe %s with properties %r" % (
497 e, recipe, properties)) 503 e, recipe, properties))
498 504
499 return results 505 return results
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698