Add depot_tools to path in chromium_upload_clang recipe.
BUG=731456
Change-Id: I48cffce978cd5849adb8736a2e4107a5593fd88b
Reviewed-on: https://chromium-review.googlesource.com/1099569
Commit-Queue: Jao-ke Chin-Lee <jchinlee@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
diff --git a/scripts/slave/README.recipes.md b/scripts/slave/README.recipes.md
index 19ee8e7..4758828 100644
--- a/scripts/slave/README.recipes.md
+++ b/scripts/slave/README.recipes.md
@@ -4431,9 +4431,9 @@
— **def [RunSteps](/scripts/slave/recipes/chromium_trybot.py#35)(api):**
### *recipes* / [chromium\_upload\_clang](/scripts/slave/recipes/chromium_upload_clang.py)
-[DEPS](/scripts/slave/recipes/chromium_upload_clang.py#7): [chromium](#recipe_modules-chromium), [depot\_tools/bot\_update][depot_tools/recipe_modules/bot_update], [depot\_tools/gsutil][depot_tools/recipe_modules/gsutil], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step]
+[DEPS](/scripts/slave/recipes/chromium_upload_clang.py#7): [chromium](#recipe_modules-chromium), [depot\_tools/bot\_update][depot_tools/recipe_modules/bot_update], [depot\_tools/depot\_tools][depot_tools/recipe_modules/depot_tools], [depot\_tools/gsutil][depot_tools/recipe_modules/gsutil], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step]
-— **def [RunSteps](/scripts/slave/recipes/chromium_upload_clang.py#61)(api):**
+— **def [RunSteps](/scripts/slave/recipes/chromium_upload_clang.py#63)(api):**
### *recipes* / [client.fletch.recipe\_autogen](/scripts/slave/recipes/client.fletch.recipe_autogen.py)
[DEPS](/scripts/slave/recipes/client.fletch.recipe_autogen.py#5): [build](#recipe_modules-build), [trigger](#recipe_modules-trigger), [depot\_tools/bot\_update][depot_tools/recipe_modules/bot_update], [depot\_tools/gclient][depot_tools/recipe_modules/gclient], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step]
diff --git a/scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_linux_linux_upload_clang.json b/scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_linux_linux_upload_clang.json
index fea7467..afb6499 100644
--- a/scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_linux_linux_upload_clang.json
+++ b/scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_linux_linux_upload_clang.json
@@ -219,6 +219,11 @@
"-u",
"[START_DIR]/src/third_party/binutils/download.py"
],
+ "env_prefixes": {
+ "PATH": [
+ "RECIPE_PACKAGE_REPO[depot_tools]"
+ ]
+ },
"name": "download binutils"
},
{
@@ -228,6 +233,11 @@
"[START_DIR]/src/tools/clang/scripts/package.py",
"--upload"
],
+ "env_prefixes": {
+ "PATH": [
+ "RECIPE_PACKAGE_REPO[depot_tools]"
+ ]
+ },
"name": "package clang"
},
{
diff --git a/scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_mac_mac_upload_clang.json b/scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_mac_mac_upload_clang.json
index 9e28e00..c1bdb7c 100644
--- a/scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_mac_mac_upload_clang.json
+++ b/scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_mac_mac_upload_clang.json
@@ -219,6 +219,11 @@
"-u",
"[START_DIR]/src/third_party/binutils/download.py"
],
+ "env_prefixes": {
+ "PATH": [
+ "RECIPE_PACKAGE_REPO[depot_tools]"
+ ]
+ },
"name": "download binutils"
},
{
@@ -228,6 +233,11 @@
"[START_DIR]/src/tools/clang/scripts/package.py",
"--upload"
],
+ "env_prefixes": {
+ "PATH": [
+ "RECIPE_PACKAGE_REPO[depot_tools]"
+ ]
+ },
"name": "package clang"
},
{
diff --git a/scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_win_win_upload_clang.json b/scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_win_win_upload_clang.json
index 3abd294..e77c554 100644
--- a/scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_win_win_upload_clang.json
+++ b/scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_win_win_upload_clang.json
@@ -219,6 +219,11 @@
"-u",
"[START_DIR]\\src\\third_party\\binutils\\download.py"
],
+ "env_prefixes": {
+ "PATH": [
+ "RECIPE_PACKAGE_REPO[depot_tools]"
+ ]
+ },
"name": "download binutils"
},
{
@@ -228,6 +233,11 @@
"[START_DIR]\\src\\tools\\clang\\scripts\\package.py",
"--upload"
],
+ "env_prefixes": {
+ "PATH": [
+ "RECIPE_PACKAGE_REPO[depot_tools]"
+ ]
+ },
"name": "package clang"
},
{
diff --git a/scripts/slave/recipes/chromium_upload_clang.py b/scripts/slave/recipes/chromium_upload_clang.py
index 8e33c7d..50d8813 100644
--- a/scripts/slave/recipes/chromium_upload_clang.py
+++ b/scripts/slave/recipes/chromium_upload_clang.py
@@ -7,7 +7,9 @@
DEPS = [
'depot_tools/bot_update',
'chromium',
+ 'depot_tools/depot_tools',
'depot_tools/gsutil',
+ 'recipe_engine/context',
'recipe_engine/path',
'recipe_engine/platform',
'recipe_engine/properties',
@@ -68,13 +70,15 @@
api.path['checkout'].join('build', 'vs_toolchain.py'), ['update'])
api.python('update mac toolchain',
api.path['checkout'].join('build', 'mac_toolchain.py'))
- api.python('download binutils',
- api.path['checkout'].join('third_party', 'binutils', 'download.py'))
+ with api.depot_tools.on_path():
+ api.python('download binutils',
+ api.path['checkout'].join('third_party', 'binutils', 'download.py'))
- api.python(
- 'package clang',
- api.path['checkout'].join('tools', 'clang', 'scripts', 'package.py'),
- args=['--upload'])
+ # Note this shares above's context manager.
+ api.python(
+ 'package clang',
+ api.path['checkout'].join('tools', 'clang', 'scripts', 'package.py'),
+ args=['--upload'])
def GenTests(api):
