diff options
author | 2018-04-17 11:28:46 +0000 | |
---|---|---|
committer | 2018-04-17 11:28:54 +0000 | |
commit | bd2e1f1ca6f511e567020bebd7479cade8e246a1 (patch) | |
tree | 754a446c7fcd806b79856de87d7682f983b0c128 /infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json | |
parent | f39bbe5a31542396a8aabf8066ee46862312d7d8 (diff) |
Revert "Reland "[infra] Run recipes through Kitchen""
This reverts commit f39bbe5a31542396a8aabf8066ee46862312d7d8.
Reason for revert: Broke lots of bots
Original change's description:
> Reland "[infra] Run recipes through Kitchen"
>
> Bug: skia:7050
> Change-Id: I331014c408dd5b6f7baafd78ffd12f1235c5bfe7
> Reviewed-on: https://skia-review.googlesource.com/121481
> Commit-Queue: Eric Boren <borenet@google.com>
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Reviewed-by: Ravi Mistry <rmistry@google.com>
TBR=borenet@google.com,benjaminwagner@google.com,rmistry@google.com
Change-Id: I4548c66a9cb0b4f105e2bc3b1c7185d14549172f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7050
Reviewed-on: https://skia-review.googlesource.com/121463
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json')
-rw-r--r-- | infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json index be2f5b89de..6f8d795cea 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json @@ -27,7 +27,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -72,7 +72,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -91,7 +91,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -109,7 +109,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -127,7 +127,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -144,7 +144,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -179,7 +179,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -188,7 +188,7 @@ "cmd": [ "adb.1.0.35", "push", - "[START_DIR]/build/out/Release/skpbench", + "[START_DIR]/out/Release/skpbench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -196,7 +196,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push skpbench" @@ -211,7 +211,7 @@ "--adb_binary", "adb.1.0.35", "--resultsfile", - "[START_DIR]/[SWARM_OUT_DIR]/table", + "[CUSTOM_[SWARM_OUT_DIR]]/table", "--config", "vk", "-v5", @@ -221,7 +221,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "skpbench" }, @@ -263,7 +263,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench/data" ], "infra_step": true, "name": "makedirs perf_dir" @@ -273,7 +273,7 @@ "python", "-u", "[START_DIR]/skia/tools/skpbench/skiaperf.py", - "[START_DIR]/[SWARM_OUT_DIR]/table", + "[CUSTOM_[SWARM_OUT_DIR]]/table", "--properties", "gitHash", "abc123", @@ -282,7 +282,7 @@ "swarming_task_id", "123456", "--outfile", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench/data/skpbench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench/data/skpbench_abc123_1337000001.json", "--key", "arch", "arm64", @@ -305,7 +305,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Parse skpbench output into Perf json" }, @@ -314,13 +314,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/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", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -354,7 +354,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" |