From 32def82f1247ccf4121345390e4a73c4b2273bd7 Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Wed, 12 Dec 2018 18:02:05 -0800 Subject: [PATCH] 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/143872d11b6f4faa095be0f8c2615bd681eb485b Update git recipes to use buildbucket API. (jsca@google.com) recipe_engine: https://crrev.com/5e53d73e9bcec42830e10b835bc328eb75c9423f [path] Use 'cleanup' dir in mkdtemp and mkstemp (sergeyberezin@google.com) R=borenet@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I9e038e4eedad70f1d4133c98c591a09459823a84 Reviewed-on: https://skia-review.googlesource.com/c/177077 Commit-Queue: Eric Boren Reviewed-by: Eric Boren --- ...0FD-GPU-MaliT880-arm64-Debug-All-Android.json | 16 ++++++++-------- ...5x-GPU-Adreno418-arm64-Debug-All-Android.json | 16 ++++++++-------- ...ng-Chorizo-CPU-Cortex_A7-arm-Release-All.json | 16 ++++++++-------- ...e-GPU-Mali400MP2-arm-Release-All-Android.json | 16 ++++++++-------- ...0FD-GPU-MaliT880-arm64-Debug-All-Android.json | 16 ++++++++-------- ...5x-GPU-Adreno418-arm64-Debug-All-Android.json | 16 ++++++++-------- ...Adreno418-arm64-Release-All-Android_ASAN.json | 16 ++++++++-------- .../full.expected/cpu_scale_failed_once.json | 16 ++++++++-------- .../full.expected/failed_infra_step.json | 16 ++++++++-------- .../full.expected/failed_read_version.json | 16 ++++++++-------- .../full.expected/retry_adb_command.json | 16 ++++++++-------- ...8-arm64-Release-All-Android_NoGPUThreads.json | 16 ++++++++-------- ...ng-Chorizo-GPU-Cortex_A7-arm-Release-All.json | 16 ++++++++-------- ...e-GPU-Mali400MP2-arm-Release-All-Android.json | 16 ++++++++-------- ...yS6-GPU-MaliT760-arm64-Debug-All-Android.json | 16 ++++++++-------- ...760-arm64-Debug-All-Android_NoGPUThreads.json | 16 ++++++++-------- ...aliT880-arm64-Release-All-Android_Vulkan.json | 16 ++++++++-------- ...PU-Snapdragon617-arm-Release-All-Android.json | 16 ++++++++-------- ...GPU-TegraX1-arm64-Debug-All-Android_CCPR.json | 16 ++++++++-------- ...s5-GPU-Adreno330-arm-Release-All-Android.json | 16 ++++++++-------- ...exus7-CPU-Tegra3-arm-Release-All-Android.json | 16 ++++++++-------- ...GPU-PowerVRG6430-x86-Release-All-Android.json | 16 ++++++++-------- ...Adreno530-arm64-Debug-All-Android_Vulkan.json | 16 ++++++++-------- ...ng-Chorizo-CPU-Cortex_A7-arm-Release-All.json | 16 ++++++++-------- ...ng-Chorizo-GPU-Cortex_A7-arm-Release-All.json | 16 ++++++++-------- .../recipes/test.expected/failed_get_hashes.json | 16 ++++++++-------- .../bots/recipes/test.expected/failed_pull.json | 10 +++++----- .../recipes/test.expected/internal_bot_2.json | 16 ++++++++-------- .../recipes/test.expected/internal_bot_5.json | 16 ++++++++-------- infra/config/recipes.cfg | 4 ++-- 30 files changed, 231 insertions(+), 231 deletions(-) diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json index 3ef73fcf2b..763f06c44b 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json @@ -671,7 +671,7 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/perf", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -693,7 +693,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "perf/*" ], "infra_step": true, @@ -701,8 +701,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -714,7 +714,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -731,7 +731,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -748,10 +748,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json index 75c5dde386..d11b550d32 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json @@ -1049,7 +1049,7 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/perf", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -1071,7 +1071,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "perf/*" ], "infra_step": true, @@ -1079,8 +1079,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -1092,7 +1092,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -1109,7 +1109,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -1126,10 +1126,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All.json index 4d4b72198b..02245f43d1 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All.json @@ -660,7 +660,7 @@ "adb", "pull", "/cache/skia/perf", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -681,7 +681,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "perf/*" ], "infra_step": true, @@ -689,8 +689,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -702,7 +702,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -719,7 +719,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -736,10 +736,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json index 4000647978..6d6207ecb6 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json @@ -713,7 +713,7 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -735,7 +735,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -743,8 +743,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -756,7 +756,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -773,7 +773,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -790,10 +790,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json index df3ef2111c..4c9b41fadd 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json @@ -671,7 +671,7 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -693,7 +693,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -701,8 +701,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -714,7 +714,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -731,7 +731,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -748,10 +748,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json index 85fcd2ec84..1b40c0f023 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json @@ -955,7 +955,7 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -977,7 +977,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -985,8 +985,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -998,7 +998,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -1015,7 +1015,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -1032,10 +1032,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json index dc91992c23..12501c7dfe 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json @@ -1042,7 +1042,7 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -1064,7 +1064,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -1072,8 +1072,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -1085,7 +1085,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -1102,7 +1102,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -1119,10 +1119,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json index c91d67d021..36c4c171fd 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json @@ -979,7 +979,7 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/perf", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -1001,7 +1001,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "perf/*" ], "infra_step": true, @@ -1009,8 +1009,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -1022,7 +1022,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -1039,7 +1039,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -1056,10 +1056,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json index efd0f247f6..b9fbf9c716 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json @@ -903,7 +903,7 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/perf", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -925,7 +925,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "perf/*" ], "infra_step": true, @@ -933,8 +933,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -946,7 +946,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -963,7 +963,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -980,10 +980,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json index 2c8fe7869d..d9da730cf3 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json @@ -954,7 +954,7 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/perf", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -976,7 +976,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "perf/*" ], "infra_step": true, @@ -984,8 +984,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -997,7 +997,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -1014,7 +1014,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -1031,10 +1031,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json index 496b62168b..52cd18847c 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json @@ -954,7 +954,7 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/perf", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -976,7 +976,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "perf/*" ], "infra_step": true, @@ -984,8 +984,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -997,7 +997,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -1014,7 +1014,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -1031,10 +1031,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads.json index d4fe082893..907c57d6b6 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads.json @@ -1057,7 +1057,7 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/perf", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -1079,7 +1079,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "perf/*" ], "infra_step": true, @@ -1087,8 +1087,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -1100,7 +1100,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -1117,7 +1117,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -1134,10 +1134,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/perf.expected/Perf-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Release-All.json index 0303e6a28f..9b8f44b009 100644 --- a/infra/bots/recipes/perf.expected/Perf-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Release-All.json @@ -416,7 +416,7 @@ "adb", "pull", "/cache/skia/perf", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -437,7 +437,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "perf/*" ], "infra_step": true, @@ -445,8 +445,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -458,7 +458,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -475,7 +475,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -492,10 +492,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json index 1bc01e129d..a3a553cd8a 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json @@ -798,7 +798,7 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -820,7 +820,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -828,8 +828,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -841,7 +841,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -858,7 +858,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -875,10 +875,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json index 96326ae5a8..b101e578dd 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json @@ -756,7 +756,7 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -778,7 +778,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -786,8 +786,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -799,7 +799,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -816,7 +816,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -833,10 +833,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android_NoGPUThreads.json b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android_NoGPUThreads.json index da43eac1c2..b09c6e5a24 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android_NoGPUThreads.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android_NoGPUThreads.json @@ -756,7 +756,7 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -778,7 +778,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -786,8 +786,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -799,7 +799,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -816,7 +816,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -833,10 +833,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan.json index 7593389f35..bc1a833649 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan.json @@ -756,7 +756,7 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -778,7 +778,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -786,8 +786,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -799,7 +799,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -816,7 +816,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -833,10 +833,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-MotoG4-CPU-Snapdragon617-arm-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-MotoG4-CPU-Snapdragon617-arm-Release-All-Android.json index 798a4ffbb1..03ce407cd2 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-MotoG4-CPU-Snapdragon617-arm-Release-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-MotoG4-CPU-Snapdragon617-arm-Release-All-Android.json @@ -756,7 +756,7 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -778,7 +778,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -786,8 +786,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -799,7 +799,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -816,7 +816,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -833,10 +833,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json index cb54317848..b683676dc4 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json @@ -756,7 +756,7 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -778,7 +778,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -786,8 +786,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -799,7 +799,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -816,7 +816,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -833,10 +833,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json index c515017207..b25230d5bb 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json @@ -798,7 +798,7 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -820,7 +820,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -828,8 +828,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -841,7 +841,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -858,7 +858,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -875,10 +875,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json index be19a7ef80..b242535f74 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json @@ -798,7 +798,7 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -820,7 +820,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -828,8 +828,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -841,7 +841,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -858,7 +858,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -875,10 +875,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVRG6430-x86-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVRG6430-x86-Release-All-Android.json index 006a6b8d20..1419c09bb6 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVRG6430-x86-Release-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVRG6430-x86-Release-All-Android.json @@ -840,7 +840,7 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -862,7 +862,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -870,8 +870,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -883,7 +883,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -900,7 +900,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -917,10 +917,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json index da1a4f3a59..f216477f88 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json @@ -940,7 +940,7 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -962,7 +962,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -970,8 +970,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -983,7 +983,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -1000,7 +1000,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -1017,10 +1017,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/test.expected/Test-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/test.expected/Test-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All.json index 9c347716fb..c224a72a03 100644 --- a/infra/bots/recipes/test.expected/Test-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All.json @@ -521,7 +521,7 @@ "adb", "pull", "/dev/shm/skia/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -542,7 +542,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -550,8 +550,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -563,7 +563,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -580,7 +580,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -597,10 +597,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/test.expected/Test-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/test.expected/Test-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Release-All.json index 74f7732eb1..f1e29e8781 100644 --- a/infra/bots/recipes/test.expected/Test-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Release-All.json @@ -628,7 +628,7 @@ "adb", "pull", "/dev/shm/skia/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -649,7 +649,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -657,8 +657,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -670,7 +670,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -687,7 +687,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -704,10 +704,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/test.expected/failed_get_hashes.json b/infra/bots/recipes/test.expected/failed_get_hashes.json index 02333a91be..f72fee1a6a 100644 --- a/infra/bots/recipes/test.expected/failed_get_hashes.json +++ b/infra/bots/recipes/test.expected/failed_get_hashes.json @@ -814,7 +814,7 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -836,7 +836,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -844,8 +844,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -857,7 +857,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -874,7 +874,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -891,10 +891,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/test.expected/failed_pull.json b/infra/bots/recipes/test.expected/failed_pull.json index 235bd65610..35eec3d54b 100644 --- a/infra/bots/recipes/test.expected/failed_pull.json +++ b/infra/bots/recipes/test.expected/failed_pull.json @@ -814,7 +814,7 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -871,7 +871,7 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -928,7 +928,7 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -952,10 +952,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/test.expected/internal_bot_2.json b/infra/bots/recipes/test.expected/internal_bot_2.json index 290ecdbc1e..bdfb91c0e4 100644 --- a/infra/bots/recipes/test.expected/internal_bot_2.json +++ b/infra/bots/recipes/test.expected/internal_bot_2.json @@ -770,7 +770,7 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -792,7 +792,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -800,8 +800,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -813,7 +813,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -830,7 +830,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -847,10 +847,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/bots/recipes/test.expected/internal_bot_5.json b/infra/bots/recipes/test.expected/internal_bot_5.json index 1a5553ec1d..30d3522808 100644 --- a/infra/bots/recipes/test.expected/internal_bot_5.json +++ b/infra/bots/recipes/test.expected/internal_bot_5.json @@ -770,7 +770,7 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -792,7 +792,7 @@ "--json-output", "/path/to/tmp/json", "glob", - "[TMP_BASE]/adb_pull_tmp_1", + "[CLEANUP]/adb_pull_tmp_1", "dm_out/*" ], "infra_step": true, @@ -800,8 +800,8 @@ "stdout": "/path/to/tmp/", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -813,7 +813,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[CLEANUP]/adb_pull_tmp_1/1.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -830,7 +830,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[CLEANUP]/adb_pull_tmp_1/2.png", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, @@ -847,10 +847,10 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" + "[CLEANUP]/adb_pull_tmp_1" ], "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "name": "adb pull.rmtree [CLEANUP]/adb_pull_tmp_1", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 801b90fee3..7628616262 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -14,12 +14,12 @@ "deps": { "depot_tools": { "branch": "master", - "revision": "3d7ef65eef5b7b61a053c666425f72e24684f6e2", + "revision": "62d2286c53b2f08cac2b848d56d6a6ca3cca3b46", "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" }, "recipe_engine": { "branch": "master", - "revision": "84b31ee25882e7f1b190dbed036fa6c3da0b53fc", + "revision": "5e53d73e9bcec42830e10b835bc328eb75c9423f", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } },