[recipes] Simplify test/perf dirs
Bug: skia:6473
Change-Id: Iee2f195ddf4bbcdabc1580f2a021d2e9a07ff0b2
Reviewed-on: https://skia-review.googlesource.com/133441
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
diff --git a/infra/bots/recipe_modules/flavor/__init__.py b/infra/bots/recipe_modules/flavor/__init__.py
index 28b3d9b..ecd545d 100644
--- a/infra/bots/recipe_modules/flavor/__init__.py
+++ b/infra/bots/recipe_modules/flavor/__init__.py
@@ -18,6 +18,7 @@
'recipe_engine/python',
'recipe_engine/raw_io',
'recipe_engine/step',
+ 'recipe_engine/tempfile',
'run',
'vars',
]
diff --git a/infra/bots/recipe_modules/flavor/android.py b/infra/bots/recipe_modules/flavor/android.py
index c3ddc05..021ca04 100644
--- a/infra/bots/recipe_modules/flavor/android.py
+++ b/infra/bots/recipe_modules/flavor/android.py
@@ -524,7 +524,18 @@
""" % self.ADB_BINARY, args=[host, device], infra_step=True)
def copy_directory_contents_to_host(self, device, host):
- self._adb('pull %s %s' % (device, host), 'pull', device, host)
+ # TODO(borenet): When all of our devices are on Android 6.0 and up, we can
+ # switch to using tar to zip up the results before pulling.
+ with self.m.step.nest('adb pull'):
+ with self.m.tempfile.temp_dir('adb_pull') as tmp:
+ self._adb('pull %s' % device, 'pull', device, tmp)
+ paths = self.m.file.glob_paths(
+ 'list pulled files',
+ tmp,
+ self.m.path.basename(device) + self.m.path.sep + '*',
+ test_data=['%d.png' % i for i in (1, 2)])
+ for p in paths:
+ self.m.file.copy('copy %s' % self.m.path.basename(p), p, host)
def read_file_on_device(self, path, **kwargs):
rv = self._adb('read %s' % path,
diff --git a/infra/bots/recipe_modules/flavor/default.py b/infra/bots/recipe_modules/flavor/default.py
index 3289e54..7425bda 100644
--- a/infra/bots/recipe_modules/flavor/default.py
+++ b/infra/bots/recipe_modules/flavor/default.py
@@ -79,10 +79,8 @@
self._chrome_path = None
self.device_dirs = DeviceDirs(
bin_dir=self.m.vars.build_dir,
- dm_dir=self.m.path.join(self.m.vars.swarming_out_dir, 'dm'),
- perf_data_dir=self.m.path.join(
- self.m.vars.swarming_out_dir,
- 'perfdata', self.m.vars.builder_name, 'data'),
+ dm_dir=self.m.vars.swarming_out_dir,
+ perf_data_dir=self.m.vars.swarming_out_dir,
resource_dir=self.m.path['start_dir'].join('skia', 'resources'),
images_dir=self.m.path['start_dir'].join('skimage'),
skp_dir=self.m.path['start_dir'].join('skp'),
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 76150fd..1df3725 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
@@ -649,11 +649,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/perf",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android/data"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -662,7 +666,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android/data"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/perf",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "perf/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
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 35a0736..c6b5a48 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
@@ -1027,11 +1027,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"pull",
"/sdcard/revenge_of_the_skiabot/perf",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android/data"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -1040,7 +1044,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android/data"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/perf",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "perf/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
index 5aceaa2..2d8b003 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
@@ -646,10 +646,10 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "rmtree data"
+ "name": "rmtree [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -661,10 +661,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "makedirs data"
+ "name": "makedirs [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -729,10 +729,10 @@
"-u",
"\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)\n",
"foo@127.0.0.1:/home/chronos/user/perf",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "scp -r foo@127.0.0.1:/home/chronos/user/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All/data",
+ "name": "scp -r foo@127.0.0.1:/home/chronos/user/perf [START_DIR]/[SWARM_OUT_DIR]",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json
index cb08989..a948fb8 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json
@@ -638,11 +638,15 @@
"name": "nanobench"
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"adb",
"pull",
"/cache/skia/perf",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All/data"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -650,7 +654,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /cache/skia/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All/data"
+ "name": "adb pull.pull /cache/skia/perf",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "perf/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
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 a936ef9..0c578fe 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
@@ -691,11 +691,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -704,7 +708,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
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 2041ee3..4eeaaba 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
@@ -649,11 +649,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -662,7 +666,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
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 4ba9725..f417951 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
@@ -933,11 +933,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -946,7 +950,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
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 0ab5073..dcbb029 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
@@ -1020,11 +1020,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -1033,7 +1037,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
index cc09931..9b1edcb 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
@@ -646,10 +646,10 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "rmtree dm"
+ "name": "rmtree [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -661,10 +661,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "makedirs dm"
+ "name": "makedirs [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -729,10 +729,10 @@
"-u",
"\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)\n",
"foo@127.0.0.1:/home/chronos/user/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "scp -r foo@127.0.0.1:/home/chronos/user/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm",
+ "name": "scp -r foo@127.0.0.1:/home/chronos/user/dm_out [START_DIR]/[SWARM_OUT_DIR]",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
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 e4c8a02..387713d 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
@@ -957,11 +957,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/perf",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android/data"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -970,7 +974,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android/data"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/perf",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "perf/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
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 338e364..6424e6e 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
@@ -881,11 +881,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/perf",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -894,7 +898,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/perf",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "perf/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
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 2ab38fa..7630a35 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
@@ -932,11 +932,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/perf",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -945,7 +949,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/perf",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "perf/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
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 45d5864..6a2d3ec 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
@@ -932,11 +932,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/perf",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -945,7 +949,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/perf",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "perf/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json
index cf73a50..8ac6453 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json
@@ -471,7 +471,7 @@
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed",
"dm",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"env": {
"CHROME_HEADLESS": "1",
diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json
index ea4e50d..bbb1e81 100644
--- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json
+++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json
@@ -122,7 +122,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Housekeeper-PerCommit/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
@@ -136,7 +136,7 @@
"--githash",
"abc123",
"--dest",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Housekeeper-PerCommit/data/nanobench_9046e2e693bb92a76e972b694580e5d17ad10748_1337000001.json",
+ "[START_DIR]/[SWARM_OUT_DIR]/nanobench_9046e2e693bb92a76e972b694580e5d17ad10748_1337000001.json",
"--issue_number",
"456789"
],
diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json
index fb0259b..17922fc 100644
--- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json
+++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json
@@ -130,7 +130,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Housekeeper-PerCommit/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
@@ -144,7 +144,7 @@
"--githash",
"abc123",
"--dest",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Housekeeper-PerCommit/data/nanobench_9046e2e693bb92a76e972b694580e5d17ad10748_1337000001.json"
+ "[START_DIR]/[SWARM_OUT_DIR]/nanobench_9046e2e693bb92a76e972b694580e5d17ad10748_1337000001.json"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
diff --git a/infra/bots/recipes/housekeeper.py b/infra/bots/recipes/housekeeper.py
index e565216..5e7dc89 100644
--- a/infra/bots/recipes/housekeeper.py
+++ b/infra/bots/recipes/housekeeper.py
@@ -42,7 +42,7 @@
ts = int(calendar.timegm(now.utctimetuple()))
filename = 'nanobench_%s_%d.json' % (got_revision, ts)
dest_dir = api.flavor.host_dirs.perf_data_dir
- dest_file = dest_dir + '/' + filename
+ dest_file = dest_dir.join(filename)
api.file.ensure_directory('makedirs perf_dir', dest_dir)
api.binary_size.run_analysis(skia_dir, dest_file)
diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json
index feeef74..3a983b4 100644
--- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json
+++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json
@@ -897,17 +897,21 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/perf",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan/data"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -916,7 +920,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan/data"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/perf",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "perf/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json
index eb4adb3..b8f1906 100644
--- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json
+++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json
@@ -881,17 +881,21 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/perf",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -900,7 +904,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/perf",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "perf/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All.json b/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All.json
index 15630df..e53a9a4 100644
--- a/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All.json
+++ b/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All.json
@@ -641,14 +641,14 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "rmtree data"
+ "name": "rmtree [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -660,14 +660,14 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "makedirs data"
+ "name": "makedirs [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -799,7 +799,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
@@ -810,10 +810,10 @@
"-u",
"\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)\n",
"foo@127.0.0.1:/home/chronos/user/perf",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "scp -r foo@127.0.0.1:/home/chronos/user/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All/data",
+ "name": "scp -r foo@127.0.0.1:/home/chronos/user/perf [START_DIR]/[SWARM_OUT_DIR]",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
diff --git a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json
index 03a70cf..1127a64 100644
--- a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json
+++ b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json
@@ -401,17 +401,21 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"adb",
"pull",
"/cache/skia/perf",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All/data"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -419,7 +423,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /cache/skia/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All/data"
+ "name": "adb pull.pull /cache/skia/perf",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "perf/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json
index 7f01b9c..c059e95 100644
--- a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json
+++ b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json
@@ -106,10 +106,10 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "rmtree data"
+ "name": "rmtree [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -121,10 +121,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "makedirs data"
+ "name": "makedirs [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -204,7 +204,7 @@
"~inc1.webp",
"--verbose",
"--outResultsFile",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All/data/nanobench_abc123_1337000001.json",
+ "[START_DIR]/[SWARM_OUT_DIR]/nanobench_abc123_1337000001.json",
"--properties",
"gitHash",
"abc123",
@@ -246,7 +246,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
diff --git a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json
index 47af8f1..b48ba32 100644
--- a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json
+++ b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json
@@ -106,10 +106,10 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "rmtree data"
+ "name": "rmtree [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -121,10 +121,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "makedirs data"
+ "name": "makedirs [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -198,7 +198,7 @@
"~inc0.webp",
"~inc1.webp",
"--outResultsFile",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan/data/nanobench_abc123_1337000001.json",
+ "[START_DIR]/[SWARM_OUT_DIR]/nanobench_abc123_1337000001.json",
"--properties",
"gitHash",
"abc123",
@@ -238,7 +238,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
diff --git a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer.json b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer.json
index 4ed26aa..a04b89b 100644
--- a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer.json
+++ b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer.json
@@ -106,10 +106,10 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "rmtree data"
+ "name": "rmtree [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -121,10 +121,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "makedirs data"
+ "name": "makedirs [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -196,7 +196,7 @@
"~inc0.webp",
"~inc1.webp",
"--outResultsFile",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer/data/nanobench_abc123_1337000001.json",
+ "[START_DIR]/[SWARM_OUT_DIR]/nanobench_abc123_1337000001.json",
"--properties",
"gitHash",
"abc123",
@@ -236,7 +236,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json
index 45b9a85..48c59bd 100644
--- a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json
+++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json
@@ -106,10 +106,10 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\\data"
+ "[START_DIR]\\[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "rmtree data"
+ "name": "rmtree [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -121,10 +121,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\\data"
+ "[START_DIR]\\[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "makedirs data"
+ "name": "makedirs [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -197,7 +197,7 @@
"~inc0.webp",
"~inc1.webp",
"--outResultsFile",
- "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\\data\\nanobench_abc123_1337000001.json",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\nanobench_abc123_1337000001.json",
"--properties",
"gitHash",
"abc123",
@@ -237,7 +237,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan"
+ "[START_DIR]\\[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json
index b842929..2e24a74 100644
--- a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json
+++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json
@@ -106,10 +106,10 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE\\data"
+ "[START_DIR]\\[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "rmtree data"
+ "name": "rmtree [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -121,10 +121,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE\\data"
+ "[START_DIR]\\[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "makedirs data"
+ "name": "makedirs [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -199,7 +199,7 @@
"~inc0.webp",
"~inc1.webp",
"--outResultsFile",
- "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE\\data\\nanobench_abc123_1337000001.json",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\nanobench_abc123_1337000001.json",
"--properties",
"gitHash",
"abc123",
@@ -239,7 +239,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE"
+ "[START_DIR]\\[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json
index 9a30762..9f93c30 100644
--- a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json
+++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json
@@ -106,10 +106,10 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\\data"
+ "[START_DIR]\\[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "rmtree data"
+ "name": "rmtree [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -121,10 +121,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\\data"
+ "[START_DIR]\\[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "makedirs data"
+ "name": "makedirs [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -197,7 +197,7 @@
"~inc0.webp",
"~inc1.webp",
"--outResultsFile",
- "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\\data\\nanobench_abc123_1337000001.json",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\nanobench_abc123_1337000001.json",
"--properties",
"gitHash",
"abc123",
@@ -237,7 +237,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE"
+ "[START_DIR]\\[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan.json
index 443d9d0..63daa8c 100644
--- a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan.json
+++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan.json
@@ -106,10 +106,10 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan\\data"
+ "[START_DIR]\\[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "rmtree data"
+ "name": "rmtree [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -121,10 +121,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan\\data"
+ "[START_DIR]\\[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "makedirs data"
+ "name": "makedirs [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -215,7 +215,7 @@
"~inc0.webp",
"~inc1.webp",
"--outResultsFile",
- "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan\\data\\nanobench_abc123_1337000001.json",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\nanobench_abc123_1337000001.json",
"--properties",
"gitHash",
"abc123",
@@ -255,7 +255,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan"
+ "[START_DIR]\\[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
diff --git a/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json b/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json
index a244653..5a190af 100644
--- a/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json
+++ b/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json
@@ -599,7 +599,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"env": {
"IOS_BUNDLE_ID": "com.google.nanobench",
@@ -612,7 +612,7 @@
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed",
"perf",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"env": {
"CHROME_HEADLESS": "1",
diff --git a/infra/bots/recipes/perf.expected/trybot.json b/infra/bots/recipes/perf.expected/trybot.json
index e26bad9..324d981 100644
--- a/infra/bots/recipes/perf.expected/trybot.json
+++ b/infra/bots/recipes/perf.expected/trybot.json
@@ -106,10 +106,10 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "rmtree data"
+ "name": "rmtree [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -121,10 +121,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "makedirs data"
+ "name": "makedirs [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -197,7 +197,7 @@
"~inc0.webp",
"~inc1.webp",
"--outResultsFile",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All/data/nanobench_abc123_1337000001.json",
+ "[START_DIR]/[SWARM_OUT_DIR]/nanobench_abc123_1337000001.json",
"--properties",
"gitHash",
"abc123",
@@ -241,7 +241,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py
index 139a8b5..cf66c0d 100644
--- a/infra/bots/recipes/perf.py
+++ b/infra/bots/recipes/perf.py
@@ -343,7 +343,7 @@
if upload_perf_results(b):
api.file.ensure_directory(
'makedirs perf_dir',
- api.path.dirname(api.flavor.host_dirs.perf_data_dir))
+ api.flavor.host_dirs.perf_data_dir)
api.flavor.copy_directory_contents_to_host(
api.flavor.device_dirs.perf_data_dir,
api.flavor.host_dirs.perf_data_dir)
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json
index 491a0a3..9616436 100644
--- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json
+++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json
@@ -186,7 +186,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
@@ -274,7 +274,7 @@
"swarming_task_id",
"123456",
"--outfile",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench/data/skpbench_abc123_1337000001.json",
+ "[START_DIR]/[SWARM_OUT_DIR]/skpbench_abc123_1337000001.json",
"--key",
"arch",
"arm64",
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json
index 225854a..eb0d210 100644
--- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json
+++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json
@@ -186,7 +186,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
@@ -270,7 +270,7 @@
"swarming_task_id",
"123456",
"--outfile",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data/skpbench_abc123_1337000001.json",
+ "[START_DIR]/[SWARM_OUT_DIR]/skpbench_abc123_1337000001.json",
"--key",
"arch",
"arm64",
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 3d68741..c29c253 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
@@ -186,7 +186,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
@@ -270,7 +270,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",
+ "[START_DIR]/[SWARM_OUT_DIR]/skpbench_abc123_1337000001.json",
"--key",
"arch",
"arm64",
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench.json
index e03ee5f..0449801 100644
--- a/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench.json
+++ b/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench.json
@@ -52,7 +52,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
@@ -118,7 +118,7 @@
"swarming_task_id",
"123456",
"--outfile",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench/data/skpbench_abc123_1337000001.json",
+ "[START_DIR]/[SWARM_OUT_DIR]/skpbench_abc123_1337000001.json",
"--key",
"arch",
"x86_64",
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLRecord_9x9.json b/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLRecord_9x9.json
index d6b58f0..b0706fc 100644
--- a/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLRecord_9x9.json
+++ b/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLRecord_9x9.json
@@ -52,7 +52,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLRecord_9x9/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
@@ -124,7 +124,7 @@
"swarming_task_id",
"123456",
"--outfile",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLRecord_9x9/data/skpbench_abc123_1337000001.json",
+ "[START_DIR]/[SWARM_OUT_DIR]/skpbench_abc123_1337000001.json",
"--key",
"arch",
"x86_64",
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9.json b/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9.json
index cb5afc5..d558b85 100644
--- a/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9.json
+++ b/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9.json
@@ -52,7 +52,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
@@ -123,7 +123,7 @@
"swarming_task_id",
"123456",
"--outfile",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9/data/skpbench_abc123_1337000001.json",
+ "[START_DIR]/[SWARM_OUT_DIR]/skpbench_abc123_1337000001.json",
"--key",
"arch",
"x86_64",
diff --git a/infra/bots/recipes/skpbench.expected/trybot.json b/infra/bots/recipes/skpbench.expected/trybot.json
index b9c6d35..7545aa3 100644
--- a/infra/bots/recipes/skpbench.expected/trybot.json
+++ b/infra/bots/recipes/skpbench.expected/trybot.json
@@ -186,7 +186,7 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
@@ -276,7 +276,7 @@
"swarming_task_id",
"123456",
"--outfile",
- "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data/skpbench_abc123_1337000001.json",
+ "[START_DIR]/[SWARM_OUT_DIR]/skpbench_abc123_1337000001.json",
"--key",
"arch",
"arm64",
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 3fa3085..2d5d3c3 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
@@ -789,11 +789,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -802,7 +806,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
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 a24732f..4078fa0 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
@@ -747,11 +747,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -760,7 +764,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
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 8b6106c..2e48804 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
@@ -747,11 +747,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -760,7 +764,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
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 71d3e63..2057812 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
@@ -747,11 +747,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -760,7 +764,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
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 2fa3f3e..713c357 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
@@ -789,11 +789,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -802,7 +806,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json
index a889ed3..6cfed5d 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json
@@ -1031,11 +1031,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -1044,7 +1048,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
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 8cfcdbc..60232c7 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
@@ -789,11 +789,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -802,7 +806,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json
index c7b15ef..c3f0b8f 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json
@@ -831,11 +831,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -844,7 +848,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
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 7447fb5..93e8143 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
@@ -931,11 +931,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -944,7 +948,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All.json b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All.json
index cd0bd7d..30f8985 100644
--- a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All.json
+++ b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All.json
@@ -736,14 +736,14 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "rmtree dm"
+ "name": "rmtree [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -755,14 +755,14 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "makedirs dm"
+ "name": "makedirs [SWARM_OUT_DIR]"
},
{
"cmd": [
@@ -984,10 +984,10 @@
"-u",
"\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)\n",
"foo@127.0.0.1:/home/chronos/user/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
- "name": "scp -r foo@127.0.0.1:/home/chronos/user/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm",
+ "name": "scp -r foo@127.0.0.1:/home/chronos/user/dm_out [START_DIR]/[SWARM_OUT_DIR]",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
diff --git a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json
index e975d38..b61a607 100644
--- a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json
+++ b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json
@@ -508,11 +508,15 @@
"name": "dm"
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"adb",
"pull",
"/dev/shm/skia/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -520,7 +524,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /dev/shm/skia/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /dev/shm/skia/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json
index dc1055d..cdd8eaf 100644
--- a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json
+++ b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json
@@ -615,11 +615,15 @@
"name": "dm"
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"adb",
"pull",
"/dev/shm/skia/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -627,7 +631,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /dev/shm/skia/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /dev/shm/skia/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
index 4925f9c..7efd5e9 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
@@ -251,7 +251,7 @@
"--uninterestingHashesFile",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]/[SWARM_OUT_DIR]/dm",
+ "[START_DIR]/[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json
index abce7e8..edd0411 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json
@@ -251,7 +251,7 @@
"--uninterestingHashesFile",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]/[SWARM_OUT_DIR]/dm",
+ "[START_DIR]/[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json
index 274ff47..e437141 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json
@@ -251,7 +251,7 @@
"--uninterestingHashesFile",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]/[SWARM_OUT_DIR]/dm",
+ "[START_DIR]/[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader.json
index 69f0988..673c909 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader.json
@@ -251,7 +251,7 @@
"--uninterestingHashesFile",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]/[SWARM_OUT_DIR]/dm",
+ "[START_DIR]/[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json
index 279eada..c7d1a36 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json
@@ -251,7 +251,7 @@
"--uninterestingHashesFile",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]/[SWARM_OUT_DIR]/dm",
+ "[START_DIR]/[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json
index f06203a..e79cade 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json
@@ -251,7 +251,7 @@
"--uninterestingHashesFile",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]/[SWARM_OUT_DIR]/dm",
+ "[START_DIR]/[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts.json
index 8840641..9ed31aa 100644
--- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts.json
+++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts.json
@@ -246,7 +246,7 @@
"--uninterestingHashesFile",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]/[SWARM_OUT_DIR]/dm",
+ "[START_DIR]/[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json
index 85da3a7..3c78195 100644
--- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json
+++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json
@@ -244,7 +244,7 @@
"--uninterestingHashesFile",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]/[SWARM_OUT_DIR]/dm",
+ "[START_DIR]/[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json
index 938cd99..3789de1 100644
--- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json
@@ -246,7 +246,7 @@
"--uninterestingHashesFile",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]/[SWARM_OUT_DIR]/dm",
+ "[START_DIR]/[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json
index 86e12f9..a3bb170 100644
--- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json
+++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json
@@ -244,7 +244,7 @@
"--uninterestingHashesFile",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]/[SWARM_OUT_DIR]/dm",
+ "[START_DIR]/[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json
index 0427b80..72058e5 100644
--- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json
+++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json
@@ -246,7 +246,7 @@
"--uninterestingHashesFile",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]/[SWARM_OUT_DIR]/dm",
+ "[START_DIR]/[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json
index f696774..5d0a37c 100644
--- a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json
+++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json
@@ -251,7 +251,7 @@
"--uninterestingHashesFile",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]/[SWARM_OUT_DIR]/dm",
+ "[START_DIR]/[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json
index 9f35ad8..fa734bd 100644
--- a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json
+++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json
@@ -251,7 +251,7 @@
"--uninterestingHashesFile",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]/[SWARM_OUT_DIR]/dm",
+ "[START_DIR]/[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json
index acc15b6..6771876 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json
@@ -246,7 +246,7 @@
"--uninterestingHashesFile",
"[START_DIR]\\tmp\\uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]\\[SWARM_OUT_DIR]\\dm",
+ "[START_DIR]\\[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json
index 65b57d1..daeb3d6 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json
@@ -246,7 +246,7 @@
"--uninterestingHashesFile",
"[START_DIR]\\tmp\\uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]\\[SWARM_OUT_DIR]\\dm",
+ "[START_DIR]\\[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json
index 908a757..6ce7d1e 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json
@@ -246,7 +246,7 @@
"--uninterestingHashesFile",
"[START_DIR]\\tmp\\uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]\\[SWARM_OUT_DIR]\\dm",
+ "[START_DIR]\\[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json
index 0983055..ac5f35d 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json
@@ -246,7 +246,7 @@
"--uninterestingHashesFile",
"[START_DIR]\\tmp\\uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]\\[SWARM_OUT_DIR]\\dm",
+ "[START_DIR]\\[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json
index ef3d4a1..ddd57a9 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json
@@ -246,7 +246,7 @@
"--uninterestingHashesFile",
"[START_DIR]\\tmp\\uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]\\[SWARM_OUT_DIR]\\dm",
+ "[START_DIR]\\[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json
index 742d017..bab3c2e 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json
@@ -246,7 +246,7 @@
"--uninterestingHashesFile",
"[START_DIR]\\tmp\\uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]\\[SWARM_OUT_DIR]\\dm",
+ "[START_DIR]\\[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan.json
index d881a5a..de7eaa4 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan.json
@@ -246,7 +246,7 @@
"--uninterestingHashesFile",
"[START_DIR]\\tmp\\uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]\\[SWARM_OUT_DIR]\\dm",
+ "[START_DIR]\\[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json
index 6c2a884..8c77383 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json
@@ -246,7 +246,7 @@
"--uninterestingHashesFile",
"[START_DIR]\\tmp\\uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]\\[SWARM_OUT_DIR]\\dm",
+ "[START_DIR]\\[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json
index e60cb0e..e357e2c 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json
@@ -246,7 +246,7 @@
"--uninterestingHashesFile",
"[START_DIR]\\tmp\\uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]\\[SWARM_OUT_DIR]\\dm",
+ "[START_DIR]\\[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json
index dcbcf09..d9e5688 100644
--- a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json
+++ b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json
@@ -246,7 +246,7 @@
"--uninterestingHashesFile",
"[START_DIR]\\tmp\\uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]\\[SWARM_OUT_DIR]\\dm",
+ "[START_DIR]\\[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json
index a41c8ce..989146f 100644
--- a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json
+++ b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json
@@ -246,7 +246,7 @@
"--uninterestingHashesFile",
"[START_DIR]\\tmp\\uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]\\[SWARM_OUT_DIR]\\dm",
+ "[START_DIR]\\[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json
index 554e919..a8627f9 100644
--- a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json
+++ b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json
@@ -246,7 +246,7 @@
"--uninterestingHashesFile",
"[START_DIR]\\tmp\\uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]\\[SWARM_OUT_DIR]\\dm",
+ "[START_DIR]\\[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json
index 958f41b..e34ba22 100644
--- a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json
+++ b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json
@@ -900,7 +900,7 @@
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed",
"dm",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[START_DIR]/[SWARM_OUT_DIR]"
],
"env": {
"CHROME_HEADLESS": "1",
diff --git a/infra/bots/recipes/test.expected/failed_dm.json b/infra/bots/recipes/test.expected/failed_dm.json
index caf20a1..880a737 100644
--- a/infra/bots/recipes/test.expected/failed_dm.json
+++ b/infra/bots/recipes/test.expected/failed_dm.json
@@ -249,7 +249,7 @@
"--uninterestingHashesFile",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]/[SWARM_OUT_DIR]/dm",
+ "[START_DIR]/[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.expected/failed_get_hashes.json b/infra/bots/recipes/test.expected/failed_get_hashes.json
index e2cca00..67ea384 100644
--- a/infra/bots/recipes/test.expected/failed_get_hashes.json
+++ b/infra/bots/recipes/test.expected/failed_get_hashes.json
@@ -791,11 +791,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -804,7 +808,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/test.expected/failed_pull.json b/infra/bots/recipes/test.expected/failed_pull.json
index ea53e3c..08f837d 100644
--- a/infra/bots/recipes/test.expected/failed_pull.json
+++ b/infra/bots/recipes/test.expected/failed_pull.json
@@ -791,11 +791,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -804,8 +808,9 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm",
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
"~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
"step returned non-zero exit code: 1",
"@@@STEP_EXCEPTION@@@"
]
@@ -822,8 +827,11 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "kill adb server after failure of 'pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm' (attempt 1)",
- "timeout": 30
+ "name": "adb pull.kill adb server after failure of 'pull /sdcard/revenge_of_the_skiabot/dm_out' (attempt 1)",
+ "timeout": 30,
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -837,15 +845,18 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "wait for device after failure of 'pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm' (attempt 1)",
- "timeout": 180
+ "name": "adb pull.wait for device after failure of 'pull /sdcard/revenge_of_the_skiabot/dm_out' (attempt 1)",
+ "timeout": 180,
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -854,8 +865,9 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm (attempt 2)",
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out (attempt 2)",
"~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
"step returned non-zero exit code: 1",
"@@@STEP_EXCEPTION@@@"
]
@@ -872,8 +884,11 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "kill adb server after failure of 'pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm' (attempt 2)",
- "timeout": 30
+ "name": "adb pull.kill adb server after failure of 'pull /sdcard/revenge_of_the_skiabot/dm_out' (attempt 2)",
+ "timeout": 30,
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -887,15 +902,18 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "wait for device after failure of 'pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm' (attempt 2)",
- "timeout": 180
+ "name": "adb pull.wait for device after failure of 'pull /sdcard/revenge_of_the_skiabot/dm_out' (attempt 2)",
+ "timeout": 180,
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -904,8 +922,9 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm (attempt 3)",
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out (attempt 3)",
"~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
"step returned non-zero exit code: 1",
"@@@STEP_EXCEPTION@@@"
]
@@ -914,6 +933,22 @@
"cmd": [
"python",
"-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "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"
],
@@ -959,7 +994,7 @@
},
{
"name": "$result",
- "reason": "Infra Failure: Step('pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm (attempt 3)') returned 1",
+ "reason": "Infra Failure: Step('adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out (attempt 3)') returned 1",
"recipe_result": null,
"status_code": 1
}
diff --git a/infra/bots/recipes/test.expected/internal_bot_1.json b/infra/bots/recipes/test.expected/internal_bot_1.json
index 66353a9..699c713 100644
--- a/infra/bots/recipes/test.expected/internal_bot_1.json
+++ b/infra/bots/recipes/test.expected/internal_bot_1.json
@@ -747,11 +747,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -760,7 +764,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/test.expected/internal_bot_2.json b/infra/bots/recipes/test.expected/internal_bot_2.json
index d188565..1700a10 100644
--- a/infra/bots/recipes/test.expected/internal_bot_2.json
+++ b/infra/bots/recipes/test.expected/internal_bot_2.json
@@ -747,11 +747,15 @@
]
},
{
+ "cmd": [],
+ "name": "adb pull"
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
- "[START_DIR]/[SWARM_OUT_DIR]/dm"
+ "[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -760,7 +764,81 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm"
+ "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[TMP_BASE]/adb_pull_tmp_1",
+ "dm_out/*"
+ ],
+ "infra_step": true,
+ "name": "adb pull.list pulled files",
+ "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_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/1.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 1.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[TMP_BASE]/adb_pull_tmp_1/2.png",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "infra_step": true,
+ "name": "adb pull.copy 2.png",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[TMP_BASE]/adb_pull_tmp_1"
+ ],
+ "infra_step": true,
+ "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/test.expected/trybot.json b/infra/bots/recipes/test.expected/trybot.json
index 6bb6df1..10b3ddf 100644
--- a/infra/bots/recipes/test.expected/trybot.json
+++ b/infra/bots/recipes/test.expected/trybot.json
@@ -250,7 +250,7 @@
"--uninterestingHashesFile",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]/[SWARM_OUT_DIR]/dm",
+ "[START_DIR]/[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index cf9de3a..55d12b4 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -44,7 +44,8 @@
blacklisted = []
def blacklist(quad):
- config, src, options, name = quad.split(' ') if type(quad) is str else quad
+ config, src, options, name = (
+ quad.split(' ') if isinstance(quad, str) else quad)
if (config == '_' or
config in configs or
(config[0] == '~' and config[1:] in configs)):
@@ -1184,8 +1185,7 @@
)
builder = 'Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android'
- retry_step_name = ('pull /sdcard/revenge_of_the_skiabot/dm_out '
- '[START_DIR]/[SWARM_OUT_DIR]/dm')
+ retry_step_name = 'adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out'
yield (
api.test('failed_pull') +
api.properties(buildername=builder,
diff --git a/infra/bots/recipes/upload_dm_results.expected/alternate_bucket.json b/infra/bots/recipes/upload_dm_results.expected/alternate_bucket.json
index e30dfc2..3863852 100644
--- a/infra/bots/recipes/upload_dm_results.expected/alternate_bucket.json
+++ b/infra/bots/recipes/upload_dm_results.expected/alternate_bucket.json
@@ -22,7 +22,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/test/dm/dm.json",
+ "[START_DIR]/test/dm.json",
"[START_DIR]/tmp_upload"
],
"infra_step": true,
@@ -36,7 +36,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/test/dm/verbose.log",
+ "[START_DIR]/test/verbose.log",
"[START_DIR]/tmp_upload"
],
"infra_step": true,
@@ -50,7 +50,7 @@
"--json-output",
"/path/to/tmp/json",
"remove",
- "[START_DIR]/test/dm/dm.json"
+ "[START_DIR]/test/dm.json"
],
"infra_step": true,
"name": "rm old dm.json"
@@ -63,7 +63,7 @@
"--json-output",
"/path/to/tmp/json",
"remove",
- "[START_DIR]/test/dm/verbose.log"
+ "[START_DIR]/test/verbose.log"
],
"infra_step": true,
"name": "rm old verbose.log"
@@ -76,14 +76,14 @@
"--json-output",
"/path/to/tmp/json",
"glob",
- "[START_DIR]/test/dm",
+ "[START_DIR]/test",
"*.png"
],
"infra_step": true,
"name": "find images",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/test/someimage.png@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
@@ -92,7 +92,7 @@
"gsutil",
"-m",
"cp",
- "[START_DIR]/test/dm/*.png",
+ "[START_DIR]/test/*.png",
"gs://skia-infra-gm/dm-images-v1"
],
"name": "upload images"
@@ -105,14 +105,14 @@
"--json-output",
"/path/to/tmp/json",
"glob",
- "[START_DIR]/test/dm",
+ "[START_DIR]/test",
"*.pdf"
],
"infra_step": true,
"name": "find images (2)",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/test/someimage.png@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
diff --git a/infra/bots/recipes/upload_dm_results.expected/failed_all.json b/infra/bots/recipes/upload_dm_results.expected/failed_all.json
index 2058e5b..d65d198 100644
--- a/infra/bots/recipes/upload_dm_results.expected/failed_all.json
+++ b/infra/bots/recipes/upload_dm_results.expected/failed_all.json
@@ -22,7 +22,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/test/dm/dm.json",
+ "[START_DIR]/test/dm.json",
"[START_DIR]/tmp_upload"
],
"infra_step": true,
@@ -36,7 +36,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/test/dm/verbose.log",
+ "[START_DIR]/test/verbose.log",
"[START_DIR]/tmp_upload"
],
"infra_step": true,
@@ -50,7 +50,7 @@
"--json-output",
"/path/to/tmp/json",
"remove",
- "[START_DIR]/test/dm/dm.json"
+ "[START_DIR]/test/dm.json"
],
"infra_step": true,
"name": "rm old dm.json"
@@ -63,7 +63,7 @@
"--json-output",
"/path/to/tmp/json",
"remove",
- "[START_DIR]/test/dm/verbose.log"
+ "[START_DIR]/test/verbose.log"
],
"infra_step": true,
"name": "rm old verbose.log"
@@ -76,14 +76,14 @@
"--json-output",
"/path/to/tmp/json",
"glob",
- "[START_DIR]/test/dm",
+ "[START_DIR]/test",
"*.png"
],
"infra_step": true,
"name": "find images",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/test/someimage.png@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
@@ -92,7 +92,7 @@
"gsutil",
"-m",
"cp",
- "[START_DIR]/test/dm/*.png",
+ "[START_DIR]/test/*.png",
"gs://skia-infra-gm/dm-images-v1"
],
"name": "upload images",
@@ -106,7 +106,7 @@
"gsutil",
"-m",
"cp",
- "[START_DIR]/test/dm/*.png",
+ "[START_DIR]/test/*.png",
"gs://skia-infra-gm/dm-images-v1"
],
"name": "upload images (attempt 2)",
@@ -120,7 +120,7 @@
"gsutil",
"-m",
"cp",
- "[START_DIR]/test/dm/*.png",
+ "[START_DIR]/test/*.png",
"gs://skia-infra-gm/dm-images-v1"
],
"name": "upload images (attempt 3)",
@@ -134,7 +134,7 @@
"gsutil",
"-m",
"cp",
- "[START_DIR]/test/dm/*.png",
+ "[START_DIR]/test/*.png",
"gs://skia-infra-gm/dm-images-v1"
],
"name": "upload images (attempt 4)",
@@ -148,7 +148,7 @@
"gsutil",
"-m",
"cp",
- "[START_DIR]/test/dm/*.png",
+ "[START_DIR]/test/*.png",
"gs://skia-infra-gm/dm-images-v1"
],
"name": "upload images (attempt 5)",
diff --git a/infra/bots/recipes/upload_dm_results.expected/failed_once.json b/infra/bots/recipes/upload_dm_results.expected/failed_once.json
index 596ec3b..d596424 100644
--- a/infra/bots/recipes/upload_dm_results.expected/failed_once.json
+++ b/infra/bots/recipes/upload_dm_results.expected/failed_once.json
@@ -22,7 +22,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/test/dm/dm.json",
+ "[START_DIR]/test/dm.json",
"[START_DIR]/tmp_upload"
],
"infra_step": true,
@@ -36,7 +36,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/test/dm/verbose.log",
+ "[START_DIR]/test/verbose.log",
"[START_DIR]/tmp_upload"
],
"infra_step": true,
@@ -50,7 +50,7 @@
"--json-output",
"/path/to/tmp/json",
"remove",
- "[START_DIR]/test/dm/dm.json"
+ "[START_DIR]/test/dm.json"
],
"infra_step": true,
"name": "rm old dm.json"
@@ -63,7 +63,7 @@
"--json-output",
"/path/to/tmp/json",
"remove",
- "[START_DIR]/test/dm/verbose.log"
+ "[START_DIR]/test/verbose.log"
],
"infra_step": true,
"name": "rm old verbose.log"
@@ -76,14 +76,14 @@
"--json-output",
"/path/to/tmp/json",
"glob",
- "[START_DIR]/test/dm",
+ "[START_DIR]/test",
"*.png"
],
"infra_step": true,
"name": "find images",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/test/someimage.png@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
@@ -92,7 +92,7 @@
"gsutil",
"-m",
"cp",
- "[START_DIR]/test/dm/*.png",
+ "[START_DIR]/test/*.png",
"gs://skia-infra-gm/dm-images-v1"
],
"name": "upload images",
@@ -106,7 +106,7 @@
"gsutil",
"-m",
"cp",
- "[START_DIR]/test/dm/*.png",
+ "[START_DIR]/test/*.png",
"gs://skia-infra-gm/dm-images-v1"
],
"name": "upload images (attempt 2)"
@@ -119,14 +119,14 @@
"--json-output",
"/path/to/tmp/json",
"glob",
- "[START_DIR]/test/dm",
+ "[START_DIR]/test",
"*.pdf"
],
"infra_step": true,
"name": "find images (2)",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/test/someimage.png@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
diff --git a/infra/bots/recipes/upload_dm_results.expected/normal_bot.json b/infra/bots/recipes/upload_dm_results.expected/normal_bot.json
index 44dfb7b..724a8577 100644
--- a/infra/bots/recipes/upload_dm_results.expected/normal_bot.json
+++ b/infra/bots/recipes/upload_dm_results.expected/normal_bot.json
@@ -22,7 +22,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/test/dm/dm.json",
+ "[START_DIR]/test/dm.json",
"[START_DIR]/tmp_upload"
],
"infra_step": true,
@@ -36,7 +36,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/test/dm/verbose.log",
+ "[START_DIR]/test/verbose.log",
"[START_DIR]/tmp_upload"
],
"infra_step": true,
@@ -50,7 +50,7 @@
"--json-output",
"/path/to/tmp/json",
"remove",
- "[START_DIR]/test/dm/dm.json"
+ "[START_DIR]/test/dm.json"
],
"infra_step": true,
"name": "rm old dm.json"
@@ -63,7 +63,7 @@
"--json-output",
"/path/to/tmp/json",
"remove",
- "[START_DIR]/test/dm/verbose.log"
+ "[START_DIR]/test/verbose.log"
],
"infra_step": true,
"name": "rm old verbose.log"
@@ -76,14 +76,14 @@
"--json-output",
"/path/to/tmp/json",
"glob",
- "[START_DIR]/test/dm",
+ "[START_DIR]/test",
"*.png"
],
"infra_step": true,
"name": "find images",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/test/someimage.png@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
@@ -92,7 +92,7 @@
"gsutil",
"-m",
"cp",
- "[START_DIR]/test/dm/*.png",
+ "[START_DIR]/test/*.png",
"gs://skia-infra-gm/dm-images-v1"
],
"name": "upload images"
@@ -105,14 +105,14 @@
"--json-output",
"/path/to/tmp/json",
"glob",
- "[START_DIR]/test/dm",
+ "[START_DIR]/test",
"*.pdf"
],
"infra_step": true,
"name": "find images (2)",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/test/someimage.png@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
diff --git a/infra/bots/recipes/upload_dm_results.expected/trybot.json b/infra/bots/recipes/upload_dm_results.expected/trybot.json
index 405da7a..2d201ec 100644
--- a/infra/bots/recipes/upload_dm_results.expected/trybot.json
+++ b/infra/bots/recipes/upload_dm_results.expected/trybot.json
@@ -22,7 +22,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/test/dm/dm.json",
+ "[START_DIR]/test/dm.json",
"[START_DIR]/tmp_upload"
],
"infra_step": true,
@@ -36,7 +36,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/test/dm/verbose.log",
+ "[START_DIR]/test/verbose.log",
"[START_DIR]/tmp_upload"
],
"infra_step": true,
@@ -50,7 +50,7 @@
"--json-output",
"/path/to/tmp/json",
"remove",
- "[START_DIR]/test/dm/dm.json"
+ "[START_DIR]/test/dm.json"
],
"infra_step": true,
"name": "rm old dm.json"
@@ -63,7 +63,7 @@
"--json-output",
"/path/to/tmp/json",
"remove",
- "[START_DIR]/test/dm/verbose.log"
+ "[START_DIR]/test/verbose.log"
],
"infra_step": true,
"name": "rm old verbose.log"
@@ -76,14 +76,14 @@
"--json-output",
"/path/to/tmp/json",
"glob",
- "[START_DIR]/test/dm",
+ "[START_DIR]/test",
"*.png"
],
"infra_step": true,
"name": "find images",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/test/someimage.png@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
@@ -92,7 +92,7 @@
"gsutil",
"-m",
"cp",
- "[START_DIR]/test/dm/*.png",
+ "[START_DIR]/test/*.png",
"gs://skia-infra-gm/dm-images-v1"
],
"name": "upload images"
@@ -105,14 +105,14 @@
"--json-output",
"/path/to/tmp/json",
"glob",
- "[START_DIR]/test/dm",
+ "[START_DIR]/test",
"*.pdf"
],
"infra_step": true,
"name": "find images (2)",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/test/someimage.png@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
diff --git a/infra/bots/recipes/upload_dm_results.py b/infra/bots/recipes/upload_dm_results.py
index 24813a7..15cd77d 100644
--- a/infra/bots/recipes/upload_dm_results.py
+++ b/infra/bots/recipes/upload_dm_results.py
@@ -29,7 +29,7 @@
builder_name = api.properties['buildername']
revision = api.properties['revision']
- results_dir = api.path['start_dir'].join('test', 'dm')
+ results_dir = api.path['start_dir'].join('test')
# Move dm.json and verbose.log to their own directory.
json_file = results_dir.join(DM_JSON)
diff --git a/infra/bots/recipes/upload_nano_results.expected/normal_bot.json b/infra/bots/recipes/upload_nano_results.expected/normal_bot.json
index 16f0599..b5ae0c9 100644
--- a/infra/bots/recipes/upload_nano_results.expected/normal_bot.json
+++ b/infra/bots/recipes/upload_nano_results.expected/normal_bot.json
@@ -7,15 +7,15 @@
"--json-output",
"/path/to/tmp/json",
"glob",
- "[START_DIR]/perf/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data",
+ "[START_DIR]/perf",
"*.json"
],
- "cwd": "[START_DIR]/perf/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data",
+ "cwd": "[START_DIR]/perf",
"infra_step": true,
"name": "find results",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/perf/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data/nanobench_abc123.json@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/perf/nanobench_abc123.json@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
@@ -25,7 +25,7 @@
"cp",
"-z",
"json",
- "[START_DIR]/perf/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data/nanobench_abc123.json",
+ "[START_DIR]/perf/nanobench_abc123.json",
"gs://skia-perf/nano-json-v1/2012/05/14/12/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/nanobench_abc123.json"
],
"infra_step": true,
diff --git a/infra/bots/recipes/upload_nano_results.expected/trybot.json b/infra/bots/recipes/upload_nano_results.expected/trybot.json
index 037e8c7..4419c5b 100644
--- a/infra/bots/recipes/upload_nano_results.expected/trybot.json
+++ b/infra/bots/recipes/upload_nano_results.expected/trybot.json
@@ -7,15 +7,15 @@
"--json-output",
"/path/to/tmp/json",
"glob",
- "[START_DIR]/perf/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data",
+ "[START_DIR]/perf",
"*.json"
],
- "cwd": "[START_DIR]/perf/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data",
+ "cwd": "[START_DIR]/perf",
"infra_step": true,
"name": "find results",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/perf/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data/nanobench_abc123.json@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/perf/nanobench_abc123.json@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
@@ -25,7 +25,7 @@
"cp",
"-z",
"json",
- "[START_DIR]/perf/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data/nanobench_abc123.json",
+ "[START_DIR]/perf/nanobench_abc123.json",
"gs://skia-perf/trybot/nano-json-v1/2012/05/14/12/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/456789/12/nanobench_abc123.json"
],
"infra_step": true,
diff --git a/infra/bots/recipes/upload_nano_results.py b/infra/bots/recipes/upload_nano_results.py
index 652e31b..08507cf 100644
--- a/infra/bots/recipes/upload_nano_results.py
+++ b/infra/bots/recipes/upload_nano_results.py
@@ -21,8 +21,7 @@
builder_name = api.properties['buildername']
now = api.time.utcnow()
- src_path = api.path['start_dir'].join(
- 'perf', 'perfdata', builder_name, 'data')
+ src_path = api.path['start_dir'].join('perf')
with api.context(cwd=src_path):
results = api.file.glob_paths(
'find results',