AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
b5e2acc413
skia2/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android.json

778 lines
31 KiB
JSON
Raw Normal View History

Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
[
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"shell",
"mkdir",
"-p",
"/sdcard/revenge_of_the_skiabot/resources"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
},
{
"cmd": [
"python",
"-u",
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb.1.0.35', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@",
"@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@",
"@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@",
"@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@",
"@@@STEP_LOG_LINE@python.inline@ continue@@@",
"@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@",
"@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@",
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb.1.0.35', 'push',@@@",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@",
"@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
[recipes] Switch to file module from recipe_engine Bug: skia:6704 Change-Id: Id3cefa643316e5676d2038a75240e16d929d6d63 Reviewed-on: https://skia-review.googlesource.com/20146 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2017-06-16 17:10:22 +00:00
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"[START_DIR]/skia/infra/bots/assets/skp/VERSION",
"/path/to/tmp/"
],
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "Get downloaded SKP VERSION"
},
{
"cmd": [
"python",
"-u",
[recipes] Switch to file module from recipe_engine Bug: skia:6704 Change-Id: Id3cefa643316e5676d2038a75240e16d929d6d63 Reviewed-on: https://skia-review.googlesource.com/20146 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2017-06-16 17:10:22 +00:00
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"42",
"[START_DIR]/tmp/SKP_VERSION"
],
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "write SKP_VERSION"
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"shell",
"cat",
"/sdcard/revenge_of_the_skiabot/SKP_VERSION"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
"stdout": "/path/to/tmp/"
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"shell",
"rm",
"-f",
"/sdcard/revenge_of_the_skiabot/SKP_VERSION"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"shell",
"rm",
"-rf",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"shell",
"mkdir",
"-p",
"/sdcard/revenge_of_the_skiabot/skps"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
"cmd": [
"python",
"-u",
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb.1.0.35', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@",
"@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@",
"@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@",
"@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@",
"@@@STEP_LOG_LINE@python.inline@ continue@@@",
"@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@",
"@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@",
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb.1.0.35', 'push',@@@",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@",
"@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"push",
"[START_DIR]/tmp/SKP_VERSION",
"/sdcard/revenge_of_the_skiabot/SKP_VERSION"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
},
{
"cmd": [
"python",
"-u",
[recipes] Switch to file module from recipe_engine Bug: skia:6704 Change-Id: Id3cefa643316e5676d2038a75240e16d929d6d63 Reviewed-on: https://skia-review.googlesource.com/20146 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2017-06-16 17:10:22 +00:00
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"[START_DIR]/skia/infra/bots/assets/skimage/VERSION",
"/path/to/tmp/"
],
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "Get downloaded skimage VERSION"
},
{
"cmd": [
"python",
"-u",
[recipes] Switch to file module from recipe_engine Bug: skia:6704 Change-Id: Id3cefa643316e5676d2038a75240e16d929d6d63 Reviewed-on: https://skia-review.googlesource.com/20146 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2017-06-16 17:10:22 +00:00
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"42",
"[START_DIR]/tmp/SK_IMAGE_VERSION"
],
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "write SK_IMAGE_VERSION"
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"shell",
"cat",
"/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
"stdout": "/path/to/tmp/"
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"shell",
"rm",
"-f",
"/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"shell",
"rm",
"-rf",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "rm /sdcard/revenge_of_the_skiabot/images"
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"shell",
"mkdir",
"-p",
"/sdcard/revenge_of_the_skiabot/images"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
"cmd": [
"python",
"-u",
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb.1.0.35', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@",
"@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@",
"@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@",
"@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@",
"@@@STEP_LOG_LINE@python.inline@ continue@@@",
"@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@",
"@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@",
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb.1.0.35', 'push',@@@",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@",
"@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"push",
"[START_DIR]/tmp/SK_IMAGE_VERSION",
"/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
},
{
"cmd": [
"python",
"-u",
[recipes] Switch to file module from recipe_engine Bug: skia:6704 Change-Id: Id3cefa643316e5676d2038a75240e16d929d6d63 Reviewed-on: https://skia-review.googlesource.com/20146 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2017-06-16 17:10:22 +00:00
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"[START_DIR]/skia/infra/bots/assets/svg/VERSION",
"/path/to/tmp/"
],
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "Get downloaded SVG VERSION"
},
{
"cmd": [
"python",
"-u",
[recipes] Switch to file module from recipe_engine Bug: skia:6704 Change-Id: Id3cefa643316e5676d2038a75240e16d929d6d63 Reviewed-on: https://skia-review.googlesource.com/20146 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2017-06-16 17:10:22 +00:00
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"42",
"[START_DIR]/tmp/SVG_VERSION"
],
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "write SVG_VERSION"
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"shell",
"cat",
"/sdcard/revenge_of_the_skiabot/SVG_VERSION"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION",
"stdout": "/path/to/tmp/"
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"shell",
"rm",
"-f",
"/sdcard/revenge_of_the_skiabot/SVG_VERSION"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION"
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"shell",
"rm",
"-rf",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "rm /sdcard/revenge_of_the_skiabot/svgs"
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"shell",
"mkdir",
"-p",
"/sdcard/revenge_of_the_skiabot/svgs"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
"cmd": [
"python",
"-u",
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb.1.0.35', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@",
"@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@",
"@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@",
"@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@",
"@@@STEP_LOG_LINE@python.inline@ continue@@@",
"@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@",
"@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@",
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb.1.0.35', 'push',@@@",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@",
"@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"push",
"[START_DIR]/tmp/SVG_VERSION",
"/sdcard/revenge_of_the_skiabot/SVG_VERSION"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
},
Clean up no-longer-used recipes stuff - Remove buildbot logic - Remove non-Gerrit logic - Remove master, slave, and build number properties Bug: skia:6473 Change-Id: I203d523f3a0e03f933c0c48d29c7aabac503b2b9 Reviewed-on: https://skia-review.googlesource.com/12625 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-04-10 13:56:10 +00:00
{
"cmd": [
"python",
"-u",
"import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n"
],
"name": "get swarming bot id",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
"import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n"
],
"name": "get swarming task id",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
Put CPU frequency scaling in recipes Bug: skia: Change-Id: I994f67c3043306d7fa612feb03f8fbe8d7bf4c91 Reviewed-on: https://skia-review.googlesource.com/73760 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-11-20 21:06:06 +00:00
{
"cmd": [
Make CPU scaling code cleaner This also makes *sure* the CPU frequency we set the device to actually "takes". Along the way, I learned if scaling_max_freq is < the frequency we set, the scaling_max_freq will be used instead, which was happening to the PixelCs and AndroidOnes. As a result, this may make those two Test- configs faster. Bug: skia: Change-Id: I10c98d37e296a19e1cf67bfe7269bb59cdd912d5 Reviewed-on: https://skia-review.googlesource.com/74360 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-11-21 21:47:16 +00:00
"python",
"-u",
Don't set min frequency for Android devices Bug: skia:7378 NOTRY=true No-Tree-Checks: true Change-Id: Iaacbc8eadaa4da9832a53d4794a2214625bef9b6 Reviewed-on: https://skia-review.googlesource.com/80842 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2017-12-05 20:54:19 +00:00
"\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nmodel = sys.argv[2]\ntarget_percent = float(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nif model == 'Nexus10':\n # Nexus10 doesn't list available frequencies, but it does give a\n # min and a max and seems to round to the nearest 100khz, so a\n # subset of those available are here.\n available_freqs = [200000, 400000, 600000, 800000, 1000000, 1200000,\n 1400000, 1700000]\nelif model == 'Nexus7':\n # Nexus7 claims to support 1300000, but only really allows 1200000\n available_freqs = [51000, 102000, 204000, 340000, 475000, 640000, 760000,\n 860000, 1000000, 1100000, 1200000]\nelse:\n # Most devices give a list of their available frequencies.\n available_freqs = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies'])\n\n # Check for message like '/system/bin/sh: file not found'\n if available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\n else:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint 'Setting frequency to %d' % freq\n\nsubprocess.check_output([ADB, 'shell', 'echo \"userspace\" > '\n '/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor'])\n# If scaling_max_freq is lower than our attempted setting, it won't take.\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq' % freq])\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq'])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed' % freq])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq']).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n",
Put CPU frequency scaling in recipes Bug: skia: Change-Id: I994f67c3043306d7fa612feb03f8fbe8d7bf4c91 Reviewed-on: https://skia-review.googlesource.com/73760 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-11-20 21:06:06 +00:00
"adb.1.0.35",
Make CPU scaling code cleaner This also makes *sure* the CPU frequency we set the device to actually "takes". Along the way, I learned if scaling_max_freq is < the frequency we set, the scaling_max_freq will be used instead, which was happening to the PixelCs and AndroidOnes. As a result, this may make those two Test- configs faster. Bug: skia: Change-Id: I10c98d37e296a19e1cf67bfe7269bb59cdd912d5 Reviewed-on: https://skia-review.googlesource.com/74360 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-11-21 21:47:16 +00:00
"Nexus5",
"0.6"
Put CPU frequency scaling in recipes Bug: skia: Change-Id: I994f67c3043306d7fa612feb03f8fbe8d7bf4c91 Reviewed-on: https://skia-review.googlesource.com/73760 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-11-20 21:06:06 +00:00
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"infra_step": true,
Make CPU scaling code cleaner This also makes *sure* the CPU frequency we set the device to actually "takes". Along the way, I learned if scaling_max_freq is < the frequency we set, the scaling_max_freq will be used instead, which was happening to the PixelCs and AndroidOnes. As a result, this may make those two Test- configs faster. Bug: skia: Change-Id: I10c98d37e296a19e1cf67bfe7269bb59cdd912d5 Reviewed-on: https://skia-review.googlesource.com/74360 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-11-21 21:47:16 +00:00
"name": "Scale CPU to 0.600000",
"timeout": 30,
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
Make cpu scaling more robust Some bots, especially the Nexus 7s, seemed to occasionally fail when setting the CPU frequency. I was unable to repro this behavior, so this is a shotgun approach. We add a 5 second delay between setting and checking, checking frequency using scaling_cur_freq instead of scaling_setspeed, set the min_freq as well as max_freq, and retry up to 3 times if setting cpu frequency fails. NOTRY=true Bug: skia: Change-Id: Id4d85d8d509c9dba8e3a0e06b5992f5adadf36d2 Reviewed-on: https://skia-review.googlesource.com/78140 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-11-30 13:35:29 +00:00
"@@@STEP_LOG_LINE@python.inline@import time@@@",
Make CPU scaling code cleaner This also makes *sure* the CPU frequency we set the device to actually "takes". Along the way, I learned if scaling_max_freq is < the frequency we set, the scaling_max_freq will be used instead, which was happening to the PixelCs and AndroidOnes. As a result, this may make those two Test- configs faster. Bug: skia: Change-Id: I10c98d37e296a19e1cf67bfe7269bb59cdd912d5 Reviewed-on: https://skia-review.googlesource.com/74360 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-11-21 21:47:16 +00:00
"@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@model = sys.argv[2]@@@",
"@@@STEP_LOG_LINE@python.inline@target_percent = float(sys.argv[3])@@@",
"@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@",
"@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@",
"@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@",
"@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@if model == 'Nexus10':@@@",
Turn up Nexus10 CPU frequencies The previous list was created from scaling_min_freq and scaling_max_freq instead of cpuinfo_min_freq and cpuinfo_max_freq which are the actual mins and maxes, not the current (transient) settings of the governor. Before: Test-Release: 61 minutes Perf-Debug: 41 minutes After: Test-Release: 32 minutes Perf-Debug: 16 minutes NOTRY=true Bug: skia: Change-Id: I9b431e92d2abcecb4fe643389daddc912a1399e1 Reviewed-on: https://skia-review.googlesource.com/78141 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Kevin Lubick <kjlubick@google.com>
2017-11-30 14:23:17 +00:00
"@@@STEP_LOG_LINE@python.inline@ # Nexus10 doesn't list available frequencies, but it does give a@@@",
"@@@STEP_LOG_LINE@python.inline@ # min and a max and seems to round to the nearest 100khz, so a@@@",
"@@@STEP_LOG_LINE@python.inline@ # subset of those available are here.@@@",
"@@@STEP_LOG_LINE@python.inline@ available_freqs = [200000, 400000, 600000, 800000, 1000000, 1200000,@@@",
"@@@STEP_LOG_LINE@python.inline@ 1400000, 1700000]@@@",
Fix scaling on Nexus 7 bots Bug: skia: NOTRY=true Change-Id: I1a1755dd03f2e6ebd8d9b2c9235cca8eb34f04ad Reviewed-on: https://skia-review.googlesource.com/75280 Reviewed-by: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Kevin Lubick <kjlubick@google.com>
2017-11-22 14:57:54 +00:00
"@@@STEP_LOG_LINE@python.inline@elif model == 'Nexus7':@@@",
"@@@STEP_LOG_LINE@python.inline@ # Nexus7 claims to support 1300000, but only really allows 1200000@@@",
"@@@STEP_LOG_LINE@python.inline@ available_freqs = [51000, 102000, 204000, 340000, 475000, 640000, 760000,@@@",
"@@@STEP_LOG_LINE@python.inline@ 860000, 1000000, 1100000, 1200000]@@@",
Make CPU scaling code cleaner This also makes *sure* the CPU frequency we set the device to actually "takes". Along the way, I learned if scaling_max_freq is < the frequency we set, the scaling_max_freq will be used instead, which was happening to the PixelCs and AndroidOnes. As a result, this may make those two Test- configs faster. Bug: skia: Change-Id: I10c98d37e296a19e1cf67bfe7269bb59cdd912d5 Reviewed-on: https://skia-review.googlesource.com/74360 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-11-21 21:47:16 +00:00
"@@@STEP_LOG_LINE@python.inline@else:@@@",
"@@@STEP_LOG_LINE@python.inline@ # Most devices give a list of their available frequencies.@@@",
"@@@STEP_LOG_LINE@python.inline@ available_freqs = subprocess.check_output([ADB, 'shell', 'cat '@@@",
"@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies'])@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@ # Check for message like '/system/bin/sh: file not found'@@@",
"@@@STEP_LOG_LINE@python.inline@ if available_freqs and '/system/bin/sh' not in available_freqs:@@@",
"@@@STEP_LOG_LINE@python.inline@ available_freqs = sorted(@@@",
"@@@STEP_LOG_LINE@python.inline@ int(i) for i in available_freqs.strip().split())@@@",
"@@@STEP_LOG_LINE@python.inline@ else:@@@",
"@@@STEP_LOG_LINE@python.inline@ raise Exception('Could not get list of available frequencies: %s' %@@@",
"@@@STEP_LOG_LINE@python.inline@ available_freqs)@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@maxfreq = available_freqs[-1]@@@",
"@@@STEP_LOG_LINE@python.inline@target = int(round(maxfreq * target_percent))@@@",
"@@@STEP_LOG_LINE@python.inline@freq = maxfreq@@@",
"@@@STEP_LOG_LINE@python.inline@for f in reversed(available_freqs):@@@",
"@@@STEP_LOG_LINE@python.inline@ if f <= target:@@@",
"@@@STEP_LOG_LINE@python.inline@ freq = f@@@",
"@@@STEP_LOG_LINE@python.inline@ break@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@print 'Setting frequency to %d' % freq@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"userspace\" > '@@@",
"@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor'])@@@",
"@@@STEP_LOG_LINE@python.inline@# If scaling_max_freq is lower than our attempted setting, it won't take.@@@",
"@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@",
"@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq' % freq])@@@",
Don't set min frequency for Android devices Bug: skia:7378 NOTRY=true No-Tree-Checks: true Change-Id: Iaacbc8eadaa4da9832a53d4794a2214625bef9b6 Reviewed-on: https://skia-review.googlesource.com/80842 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2017-12-05 20:54:19 +00:00
"@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo 0 > '@@@",
"@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq'])@@@",
Make cpu scaling more robust Some bots, especially the Nexus 7s, seemed to occasionally fail when setting the CPU frequency. I was unable to repro this behavior, so this is a shotgun approach. We add a 5 second delay between setting and checking, checking frequency using scaling_cur_freq instead of scaling_setspeed, set the min_freq as well as max_freq, and retry up to 3 times if setting cpu frequency fails. NOTRY=true Bug: skia: Change-Id: Id4d85d8d509c9dba8e3a0e06b5992f5adadf36d2 Reviewed-on: https://skia-review.googlesource.com/78140 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-11-30 13:35:29 +00:00
"@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@",
Make CPU scaling code cleaner This also makes *sure* the CPU frequency we set the device to actually "takes". Along the way, I learned if scaling_max_freq is < the frequency we set, the scaling_max_freq will be used instead, which was happening to the PixelCs and AndroidOnes. As a result, this may make those two Test- configs faster. Bug: skia: Change-Id: I10c98d37e296a19e1cf67bfe7269bb59cdd912d5 Reviewed-on: https://skia-review.googlesource.com/74360 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-11-21 21:47:16 +00:00
"@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed' % freq])@@@",
Make cpu scaling more robust Some bots, especially the Nexus 7s, seemed to occasionally fail when setting the CPU frequency. I was unable to repro this behavior, so this is a shotgun approach. We add a 5 second delay between setting and checking, checking frequency using scaling_cur_freq instead of scaling_setspeed, set the min_freq as well as max_freq, and retry up to 3 times if setting cpu frequency fails. NOTRY=true Bug: skia: Change-Id: Id4d85d8d509c9dba8e3a0e06b5992f5adadf36d2 Reviewed-on: https://skia-review.googlesource.com/78140 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-11-30 13:35:29 +00:00
"@@@STEP_LOG_LINE@python.inline@time.sleep(5)@@@",
Make CPU scaling code cleaner This also makes *sure* the CPU frequency we set the device to actually "takes". Along the way, I learned if scaling_max_freq is < the frequency we set, the scaling_max_freq will be used instead, which was happening to the PixelCs and AndroidOnes. As a result, this may make those two Test- configs faster. Bug: skia: Change-Id: I10c98d37e296a19e1cf67bfe7269bb59cdd912d5 Reviewed-on: https://skia-review.googlesource.com/74360 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-11-21 21:47:16 +00:00
"@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@",
Make cpu scaling more robust Some bots, especially the Nexus 7s, seemed to occasionally fail when setting the CPU frequency. I was unable to repro this behavior, so this is a shotgun approach. We add a 5 second delay between setting and checking, checking frequency using scaling_cur_freq instead of scaling_setspeed, set the min_freq as well as max_freq, and retry up to 3 times if setting cpu frequency fails. NOTRY=true Bug: skia: Change-Id: Id4d85d8d509c9dba8e3a0e06b5992f5adadf36d2 Reviewed-on: https://skia-review.googlesource.com/78140 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-11-30 13:35:29 +00:00
"@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq']).strip()@@@",
Make CPU scaling code cleaner This also makes *sure* the CPU frequency we set the device to actually "takes". Along the way, I learned if scaling_max_freq is < the frequency we set, the scaling_max_freq will be used instead, which was happening to the PixelCs and AndroidOnes. As a result, this may make those two Test- configs faster. Bug: skia: Change-Id: I10c98d37e296a19e1cf67bfe7269bb59cdd912d5 Reviewed-on: https://skia-review.googlesource.com/74360 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-11-21 21:47:16 +00:00
"@@@STEP_LOG_LINE@python.inline@if actual_freq != str(freq):@@@",
"@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@",
"@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
Put CPU frequency scaling in recipes Bug: skia: Change-Id: I994f67c3043306d7fa612feb03f8fbe8d7bf4c91 Reviewed-on: https://skia-review.googlesource.com/73760 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-11-20 21:06:06 +00:00
},
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"push",
"[START_DIR]/out/Debug/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "push nanobench"
},
{
"cmd": [
"python",
"-u",
[recipes] Switch to file module from recipe_engine Bug: skia:6704 Change-Id: Id3cefa643316e5676d2038a75240e16d929d6d63 Reviewed-on: https://skia-review.googlesource.com/20146 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2017-06-16 17:10:22 +00:00
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
remove ThermalManager It throttles 1000x more than intended, and I suspect that some of the trip points it uses to decide when to throttle make no sense. We've already turned it off on the Nexus 5x. Change-Id: Idf556a83fe61ccc5f63c7bede3eecbe80087e28b Reviewed-on: https://skia-review.googlesource.com/81303 Reviewed-by: Kevin Lubick <kjlubick@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-12-06 20:05:26 +00:00
"set -x; /data/local/tmp/nanobench -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --pre_log --images --gpuStatsDump true --scales 1.0 1.1 --nocpu --config gles glessrgb glesmsaa4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi_shop_mobileweb_ebay_com.skp ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp; echo $? >/data/local/tmp/rc",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"[START_DIR]/tmp/nanobench.sh"
],
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "write nanobench.sh"
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"push",
"[START_DIR]/tmp/nanobench.sh",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "push nanobench.sh"
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"logcat",
"-c"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "clear log"
},
{
"cmd": [
"python",
"-u",
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['adb.1.0.35', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['adb.1.0.35', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print \"Couldn't read the return code. Probably killed for OOM.\"\n sys.exit(1)\n",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"/data/local/tmp/",
"nanobench.sh"
],
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "nanobench",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@bin_dir = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@",
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['adb.1.0.35', 'shell', 'sh', bin_dir + sh])@@@",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"@@@STEP_LOG_LINE@python.inline@try:@@@",
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['adb.1.0.35', 'shell', 'cat',@@@",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@",
"@@@STEP_LOG_LINE@python.inline@except ValueError:@@@",
"@@@STEP_LOG_LINE@python.inline@ print \"Couldn't read the return code. Probably killed for OOM.\"@@@",
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"[START_DIR]/out/Debug"
],
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "dump log",
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"timeout": 300,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@",
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['adb.1.0.35', 'logcat', '-d'])@@@",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@",
"@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@",
"@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@",
"@@@STEP_LOG_LINE@python.inline@ addr, path = tokens[-2:]@@@",
"@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@",
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@",
"@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@",
"@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@",
"@@@STEP_LOG_LINE@python.inline@ print line@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
Update to adb 1.0.35 The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-10-12 16:21:47 +00:00
"adb.1.0.35",
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"kill-server"
],
"cwd": "[START_DIR]/skia",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Robbie Iannucci <iannucci@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-05-31 23:13:27 +00:00
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
Followup fixes for recipe roll Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-03-21 12:20:33 +00:00
"SKIA_OUT": "[START_DIR]/out"
},
Roll Recipe DEPS Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 16:48:31 +00:00
"infra_step": true,
Copy modules back in from skia-recipes repo BUG=skia:6070 Change-Id: I86b3f039c27bd8287516c1db8bd1cae62888171b Reviewed-on: https://skia-review.googlesource.com/7890 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-02-02 14:02:37 +00:00
"name": "kill adb server"
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
]
Reference in New Issue Copy Permalink