aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra
diff options
context:
space:
mode:
authorGravatar Ravi Mistry <rmistry@google.com>2018-02-05 13:16:34 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-02-05 18:34:46 +0000
commit73e391db8a17b6f448d77975b540eef1a26bdda8 (patch)
treee9c464ffc6ef1a09d72d45b7a522e569cd7daa58 /infra
parent9708af826cab6f7194aa852922e53cccbc7fd0a3 (diff)
[Android Compile Bot] Look at the start_dir for trigger_wait_ac_task.py
Noticed this when trybots were not using changes to trigger_wait_ac_task.py NoTry: true Bug: skia:7469 Change-Id: Ifac964e247bfd6862fa030fbf5176f179ef7f3c4 Reviewed-on: https://skia-review.googlesource.com/103521 Commit-Queue: Ravi Mistry <rmistry@google.com> Reviewed-by: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra')
-rw-r--r--infra/bots/recipes/android_compile.expected/android_compile_trybot.json2
-rw-r--r--infra/bots/recipes/android_compile.py6
2 files changed, 3 insertions, 5 deletions
diff --git a/infra/bots/recipes/android_compile.expected/android_compile_trybot.json b/infra/bots/recipes/android_compile.expected/android_compile_trybot.json
index 7ab6f8e4df..51873341c0 100644
--- a/infra/bots/recipes/android_compile.expected/android_compile_trybot.json
+++ b/infra/bots/recipes/android_compile.expected/android_compile_trybot.json
@@ -2,7 +2,7 @@
{
"cmd": [
"python",
- "[CUSTOM_/_B_WORK]/skia/infra/bots/android_compile/trigger_wait_ac_task.py",
+ "[START_DIR]/skia/infra/bots/android_compile/trigger_wait_ac_task.py",
"--issue",
"1234",
"--patchset",
diff --git a/infra/bots/recipes/android_compile.py b/infra/bots/recipes/android_compile.py
index 8f8489d584..f0ae25a30f 100644
--- a/infra/bots/recipes/android_compile.py
+++ b/infra/bots/recipes/android_compile.py
@@ -7,15 +7,13 @@ import math
DEPS = [
+ 'recipe_engine/path',
'recipe_engine/properties',
'recipe_engine/step',
- 'vars',
]
def RunSteps(api):
- api.vars.setup()
-
buildername = api.properties['buildername']
issue = api.properties.get('patch_issue')
patchset = api.properties.get('patch_set')
@@ -26,7 +24,7 @@ def RunSteps(api):
# not currently have a way to do the same for non-trybot runs.
raise Exception('%s can only be run as a trybot.' % buildername)
- infrabots_dir = api.vars.skia_dir.join('infra', 'bots')
+ infrabots_dir = api.path['start_dir'].join('skia', 'infra', 'bots')
trigger_wait_ac_script = infrabots_dir.join('android_compile',
'trigger_wait_ac_task.py')