aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots/recipes
diff options
context:
space:
mode:
authorGravatar Ravi Mistry <rmistry@google.com>2017-12-13 16:27:38 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-12-13 22:01:40 +0000
commit6df4befce64198b6345aef74cf53a10dbf242105 (patch)
tree432d8477f135cc0349ef640990c2609ec4f8a48e /infra/bots/recipes
parent411b8ea74d66d08252d9b617d7e7d458604dbc2e (diff)
[Infra] Fix skiaserve source location again
Bug: skia:7399 Change-Id: I749764f2dfc8239e9849cc09e68fb28932d58243 Reviewed-on: https://skia-review.googlesource.com/84861 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Ravi Mistry <rmistry@google.com>
Diffstat (limited to 'infra/bots/recipes')
-rw-r--r--infra/bots/recipes/upload_skiaserve.expected/normal_bot.json2
-rw-r--r--infra/bots/recipes/upload_skiaserve.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/infra/bots/recipes/upload_skiaserve.expected/normal_bot.json b/infra/bots/recipes/upload_skiaserve.expected/normal_bot.json
index 75feeef396..10e2745965 100644
--- a/infra/bots/recipes/upload_skiaserve.expected/normal_bot.json
+++ b/infra/bots/recipes/upload_skiaserve.expected/normal_bot.json
@@ -3,7 +3,7 @@
"cmd": [
"gsutil",
"cp",
- "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android/Release/skiaserve",
+ "[START_DIR]/out/Release/skiaserve",
"gs://skia-public-binaries/skiaserve/arm/abc123/"
],
"name": "upload skiaserve"
diff --git a/infra/bots/recipes/upload_skiaserve.py b/infra/bots/recipes/upload_skiaserve.py
index fb10841ff7..6e1f61b2c4 100644
--- a/infra/bots/recipes/upload_skiaserve.py
+++ b/infra/bots/recipes/upload_skiaserve.py
@@ -27,7 +27,7 @@ def RunSteps(api):
# Do not upload skiaserve for trybots.
return
- src = api.vars.skia_out.join(api.vars.configuration, 'skiaserve')
+ src = api.path['start_dir'].join('out', api.vars.configuration, 'skiaserve')
target_arch = api.vars.builder_cfg.get('target_arch')
dest = 'gs://skia-public-binaries/skiaserve/%s/%s/' % (
target_arch, api.properties['revision'])