Revert "Simplify pushing directories to android devices"
This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e.
Reason for revert: Breaks with CIPD packages / symlinks?
Original change's description:
> Simplify pushing directories to android devices
>
> Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217
> Reviewed-by: Mike Klein <mtklein@google.com>
> Commit-Queue: Mike Klein <mtklein@google.com>
TBR=mtklein@google.com,brianosman@google.com
Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
diff --git a/infra/bots/recipe_modules/flavor/android.py b/infra/bots/recipe_modules/flavor/android.py
index dc3c830..5b047c1 100644
--- a/infra/bots/recipe_modules/flavor/android.py
+++ b/infra/bots/recipe_modules/flavor/android.py
@@ -553,7 +553,30 @@
self._adb('push %s %s' % (host, device), 'push', host, device)
def copy_directory_contents_to_device(self, host, device):
- self._adb('push %s %s' % (host, device), 'push', host, device)
+ # Copy the tree, avoiding hidden directories and resolving symlinks.
+ sep = self.m.path.sep
+ host_str = str(host).rstrip(sep) + sep
+ device = device.rstrip('/')
+ with self.m.step.nest('push %s* %s' % (host_str, device)):
+ contents = self.m.file.listdir('list %s' % host, host, recursive=True,
+ test_data=['file1',
+ 'subdir' + sep + 'file2',
+ '.file3',
+ '.ignore' + sep + 'file4'])
+ for path in contents:
+ path_str = str(path)
+ assert path_str.startswith(host_str), (
+ 'expected %s to have %s as a prefix' % (path_str, host_str))
+ relpath = path_str[len(host_str):]
+ # NOTE(dogben): Previous logic used os.walk and skipped directories
+ # starting with '.', but not files starting with '.'. It's not clear
+ # what the reason was (maybe skipping .git?), but I'm keeping that
+ # behavior here.
+ if self.m.path.dirname(relpath).startswith('.'):
+ continue
+ device_path = device + '/' + relpath # Android paths use /
+ self._adb('push %s' % path, 'push',
+ self.m.path.realpath(path), device_path)
def copy_directory_contents_to_host(self, device, host):
# TODO(borenet): When all of our devices are on Android 6.0 and up, we can
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json
index 26771a9..1c06920 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json
@@ -195,11 +195,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -208,7 +234,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -368,11 +435,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -381,7 +474,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -557,11 +691,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skimage",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.list [START_DIR]/skimage",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skimage",
- "/sdcard/revenge_of_the_skiabot/images"
+ "[START_DIR]/skimage/.file3",
+ "/sdcard/revenge_of_the_skiabot/images/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -570,7 +730,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skimage /sdcard/revenge_of_the_skiabot/images"
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/file1",
+ "/sdcard/revenge_of_the_skiabot/images/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/images/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -746,11 +947,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/svg",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.list [START_DIR]/svg",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/svg",
- "/sdcard/revenge_of_the_skiabot/svgs"
+ "[START_DIR]/svg/.file3",
+ "/sdcard/revenge_of_the_skiabot/svgs/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -759,7 +986,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/svg /sdcard/revenge_of_the_skiabot/svgs"
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/file1",
+ "/sdcard/revenge_of_the_skiabot/svgs/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/svgs/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json
index 5367f9a..4576d79 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json
@@ -228,11 +228,37 @@
"name": "push nanobench"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -241,7 +267,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -401,11 +468,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -414,7 +507,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -590,11 +724,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skimage",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.list [START_DIR]/skimage",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skimage",
- "/sdcard/revenge_of_the_skiabot/images"
+ "[START_DIR]/skimage/.file3",
+ "/sdcard/revenge_of_the_skiabot/images/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -603,7 +763,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skimage /sdcard/revenge_of_the_skiabot/images"
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/file1",
+ "/sdcard/revenge_of_the_skiabot/images/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/images/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -779,11 +980,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/svg",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.list [START_DIR]/svg",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/svg",
- "/sdcard/revenge_of_the_skiabot/svgs"
+ "[START_DIR]/svg/.file3",
+ "/sdcard/revenge_of_the_skiabot/svgs/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -792,7 +1019,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/svg /sdcard/revenge_of_the_skiabot/svgs"
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/file1",
+ "/sdcard/revenge_of_the_skiabot/svgs/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/svgs/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
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 22b6610..986f336 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
@@ -211,11 +211,37 @@
"name": "push nanobench"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -224,7 +250,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -384,11 +451,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -397,7 +490,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -573,11 +707,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skimage",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.list [START_DIR]/skimage",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skimage",
- "/sdcard/revenge_of_the_skiabot/images"
+ "[START_DIR]/skimage/.file3",
+ "/sdcard/revenge_of_the_skiabot/images/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -586,7 +746,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skimage /sdcard/revenge_of_the_skiabot/images"
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/file1",
+ "/sdcard/revenge_of_the_skiabot/images/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/images/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -762,11 +963,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/svg",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.list [START_DIR]/svg",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/svg",
- "/sdcard/revenge_of_the_skiabot/svgs"
+ "[START_DIR]/svg/.file3",
+ "/sdcard/revenge_of_the_skiabot/svgs/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -775,7 +1002,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/svg /sdcard/revenge_of_the_skiabot/svgs"
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/file1",
+ "/sdcard/revenge_of_the_skiabot/svgs/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/svgs/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json
index 22d19f5..461c54d 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json
@@ -368,11 +368,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/text_blob_traces"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/text_blob_traces/* /sdcard/revenge_of_the_skiabot/text_blob_traces"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/text_blob_traces",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/text_blob_traces/* /sdcard/revenge_of_the_skiabot/text_blob_traces.list [START_DIR]/text_blob_traces",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/text_blob_traces/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/text_blob_traces/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/text_blob_traces/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/text_blob_traces/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/text_blob_traces",
- "/sdcard/revenge_of_the_skiabot/text_blob_traces"
+ "[START_DIR]/text_blob_traces/.file3",
+ "/sdcard/revenge_of_the_skiabot/text_blob_traces/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -381,7 +407,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/text_blob_traces /sdcard/revenge_of_the_skiabot/text_blob_traces"
+ "name": "push [START_DIR]/text_blob_traces/* /sdcard/revenge_of_the_skiabot/text_blob_traces.push [START_DIR]/text_blob_traces/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/text_blob_traces/file1",
+ "/sdcard/revenge_of_the_skiabot/text_blob_traces/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/text_blob_traces/* /sdcard/revenge_of_the_skiabot/text_blob_traces.push [START_DIR]/text_blob_traces/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/text_blob_traces/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/text_blob_traces/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/text_blob_traces/* /sdcard/revenge_of_the_skiabot/text_blob_traces.push [START_DIR]/text_blob_traces/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -400,11 +467,37 @@
"name": "push [START_DIR]/tmp/TEXTTRACES_VERSION /sdcard/revenge_of_the_skiabot/TEXTTRACES_VERSION"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -413,7 +506,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -573,11 +707,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -586,7 +746,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -762,11 +963,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skimage",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.list [START_DIR]/skimage",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skimage",
- "/sdcard/revenge_of_the_skiabot/images"
+ "[START_DIR]/skimage/.file3",
+ "/sdcard/revenge_of_the_skiabot/images/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -775,7 +1002,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skimage /sdcard/revenge_of_the_skiabot/images"
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/file1",
+ "/sdcard/revenge_of_the_skiabot/images/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/images/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -951,11 +1219,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/svg",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.list [START_DIR]/svg",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/svg",
- "/sdcard/revenge_of_the_skiabot/svgs"
+ "[START_DIR]/svg/.file3",
+ "/sdcard/revenge_of_the_skiabot/svgs/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -964,7 +1258,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/svg /sdcard/revenge_of_the_skiabot/svgs"
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/file1",
+ "/sdcard/revenge_of_the_skiabot/svgs/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/svgs/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/subdir/file2",
+ "~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 4dfe158..5d2b1bd 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
@@ -589,11 +589,37 @@
"name": "push nanobench"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -602,7 +628,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -762,11 +829,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -775,7 +868,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -951,11 +1085,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skimage",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.list [START_DIR]/skimage",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skimage",
- "/sdcard/revenge_of_the_skiabot/images"
+ "[START_DIR]/skimage/.file3",
+ "/sdcard/revenge_of_the_skiabot/images/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -964,7 +1124,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skimage /sdcard/revenge_of_the_skiabot/images"
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/file1",
+ "/sdcard/revenge_of_the_skiabot/images/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/images/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1140,11 +1341,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/svg",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.list [START_DIR]/svg",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/svg",
- "/sdcard/revenge_of_the_skiabot/svgs"
+ "[START_DIR]/svg/.file3",
+ "/sdcard/revenge_of_the_skiabot/svgs/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -1153,7 +1380,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/svg /sdcard/revenge_of_the_skiabot/svgs"
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/file1",
+ "/sdcard/revenge_of_the_skiabot/svgs/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/svgs/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json
index 32e058a..bd76401 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json
@@ -584,11 +584,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/mskp"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/mskp/* /sdcard/revenge_of_the_skiabot/mskp"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/mskp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/mskp/* /sdcard/revenge_of_the_skiabot/mskp.list [START_DIR]/mskp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/mskp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/mskp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/mskp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/mskp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/mskp",
- "/sdcard/revenge_of_the_skiabot/mskp"
+ "[START_DIR]/mskp/.file3",
+ "/sdcard/revenge_of_the_skiabot/mskp/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -597,7 +623,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/mskp /sdcard/revenge_of_the_skiabot/mskp"
+ "name": "push [START_DIR]/mskp/* /sdcard/revenge_of_the_skiabot/mskp.push [START_DIR]/mskp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/mskp/file1",
+ "/sdcard/revenge_of_the_skiabot/mskp/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/mskp/* /sdcard/revenge_of_the_skiabot/mskp.push [START_DIR]/mskp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/mskp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/mskp/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/mskp/* /sdcard/revenge_of_the_skiabot/mskp.push [START_DIR]/mskp/subdir/file2",
+ "~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 4561b05..9c5c00d 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
@@ -253,11 +253,37 @@
"name": "push dm"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -266,7 +292,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -426,11 +493,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -439,7 +532,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -615,11 +749,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skimage",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.list [START_DIR]/skimage",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skimage",
- "/sdcard/revenge_of_the_skiabot/images"
+ "[START_DIR]/skimage/.file3",
+ "/sdcard/revenge_of_the_skiabot/images/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -628,7 +788,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skimage /sdcard/revenge_of_the_skiabot/images"
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/file1",
+ "/sdcard/revenge_of_the_skiabot/images/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/images/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -804,11 +1005,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/svg",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.list [START_DIR]/svg",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/svg",
- "/sdcard/revenge_of_the_skiabot/svgs"
+ "[START_DIR]/svg/.file3",
+ "/sdcard/revenge_of_the_skiabot/svgs/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -817,7 +1044,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/svg /sdcard/revenge_of_the_skiabot/svgs"
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/file1",
+ "/sdcard/revenge_of_the_skiabot/svgs/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/svgs/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/subdir/file2",
+ "~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 901c9cd..8faa3ba 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
@@ -211,11 +211,37 @@
"name": "push dm"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -224,7 +250,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -384,11 +451,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -397,7 +490,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -573,11 +707,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skimage",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.list [START_DIR]/skimage",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skimage",
- "/sdcard/revenge_of_the_skiabot/images"
+ "[START_DIR]/skimage/.file3",
+ "/sdcard/revenge_of_the_skiabot/images/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -586,7 +746,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skimage /sdcard/revenge_of_the_skiabot/images"
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/file1",
+ "/sdcard/revenge_of_the_skiabot/images/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/images/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -762,11 +963,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/svg",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.list [START_DIR]/svg",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/svg",
- "/sdcard/revenge_of_the_skiabot/svgs"
+ "[START_DIR]/svg/.file3",
+ "/sdcard/revenge_of_the_skiabot/svgs/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -775,7 +1002,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/svg /sdcard/revenge_of_the_skiabot/svgs"
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/file1",
+ "/sdcard/revenge_of_the_skiabot/svgs/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/svgs/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/subdir/file2",
+ "~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 641baae..a777441 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
@@ -495,11 +495,37 @@
"name": "push dm"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -508,7 +534,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -668,11 +735,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -681,7 +774,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -857,11 +991,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skimage",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.list [START_DIR]/skimage",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skimage",
- "/sdcard/revenge_of_the_skiabot/images"
+ "[START_DIR]/skimage/.file3",
+ "/sdcard/revenge_of_the_skiabot/images/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -870,7 +1030,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skimage /sdcard/revenge_of_the_skiabot/images"
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/file1",
+ "/sdcard/revenge_of_the_skiabot/images/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/images/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1046,11 +1247,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/svg",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.list [START_DIR]/svg",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/svg",
- "/sdcard/revenge_of_the_skiabot/svgs"
+ "[START_DIR]/svg/.file3",
+ "/sdcard/revenge_of_the_skiabot/svgs/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -1059,7 +1286,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/svg /sdcard/revenge_of_the_skiabot/svgs"
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/file1",
+ "/sdcard/revenge_of_the_skiabot/svgs/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/svgs/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/subdir/file2",
+ "~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 349fc49..808a854 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
@@ -585,11 +585,37 @@
"name": "push dm"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -598,7 +624,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -758,11 +825,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -771,7 +864,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -947,11 +1081,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skimage",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.list [START_DIR]/skimage",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skimage",
- "/sdcard/revenge_of_the_skiabot/images"
+ "[START_DIR]/skimage/.file3",
+ "/sdcard/revenge_of_the_skiabot/images/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -960,7 +1120,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skimage /sdcard/revenge_of_the_skiabot/images"
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/file1",
+ "/sdcard/revenge_of_the_skiabot/images/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/images/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1136,11 +1337,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/svg",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.list [START_DIR]/svg",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/svg",
- "/sdcard/revenge_of_the_skiabot/svgs"
+ "[START_DIR]/svg/.file3",
+ "/sdcard/revenge_of_the_skiabot/svgs/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -1149,7 +1376,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/svg /sdcard/revenge_of_the_skiabot/svgs"
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/file1",
+ "/sdcard/revenge_of_the_skiabot/svgs/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/svgs/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json
index e1814ab..ae935f1 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json
@@ -253,11 +253,37 @@
"name": "push dm"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -266,7 +292,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -426,11 +493,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -439,7 +532,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -615,11 +749,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skimage",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.list [START_DIR]/skimage",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skimage",
- "/sdcard/revenge_of_the_skiabot/images"
+ "[START_DIR]/skimage/.file3",
+ "/sdcard/revenge_of_the_skiabot/images/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -628,7 +788,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skimage /sdcard/revenge_of_the_skiabot/images"
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/file1",
+ "/sdcard/revenge_of_the_skiabot/images/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/images/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -804,11 +1005,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/svg",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.list [START_DIR]/svg",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/svg",
- "/sdcard/revenge_of_the_skiabot/svgs"
+ "[START_DIR]/svg/.file3",
+ "/sdcard/revenge_of_the_skiabot/svgs/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -817,7 +1044,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/svg /sdcard/revenge_of_the_skiabot/svgs"
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/file1",
+ "/sdcard/revenge_of_the_skiabot/svgs/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/svgs/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
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 f8661bf..8c9dfd1 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
@@ -664,11 +664,37 @@
"name": "push nanobench"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -677,7 +703,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -837,11 +904,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -850,7 +943,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1026,11 +1160,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skimage",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.list [START_DIR]/skimage",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skimage",
- "/sdcard/revenge_of_the_skiabot/images"
+ "[START_DIR]/skimage/.file3",
+ "/sdcard/revenge_of_the_skiabot/images/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -1039,7 +1199,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skimage /sdcard/revenge_of_the_skiabot/images"
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/file1",
+ "/sdcard/revenge_of_the_skiabot/images/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/images/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1215,11 +1416,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/svg",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.list [START_DIR]/svg",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/svg",
- "/sdcard/revenge_of_the_skiabot/svgs"
+ "[START_DIR]/svg/.file3",
+ "/sdcard/revenge_of_the_skiabot/svgs/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -1228,7 +1455,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/svg /sdcard/revenge_of_the_skiabot/svgs"
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/file1",
+ "/sdcard/revenge_of_the_skiabot/svgs/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/svgs/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/subdir/file2",
+ "~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 c02cb56..67e198c 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
@@ -589,11 +589,37 @@
"name": "push nanobench"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -602,7 +628,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -762,11 +829,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -775,7 +868,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -951,11 +1085,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skimage",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.list [START_DIR]/skimage",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skimage",
- "/sdcard/revenge_of_the_skiabot/images"
+ "[START_DIR]/skimage/.file3",
+ "/sdcard/revenge_of_the_skiabot/images/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -964,7 +1124,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skimage /sdcard/revenge_of_the_skiabot/images"
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/file1",
+ "/sdcard/revenge_of_the_skiabot/images/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/images/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1140,11 +1341,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/svg",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.list [START_DIR]/svg",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/svg",
- "/sdcard/revenge_of_the_skiabot/svgs"
+ "[START_DIR]/svg/.file3",
+ "/sdcard/revenge_of_the_skiabot/svgs/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -1153,7 +1380,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/svg /sdcard/revenge_of_the_skiabot/svgs"
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/file1",
+ "/sdcard/revenge_of_the_skiabot/svgs/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/svgs/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/subdir/file2",
+ "~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 6d20e9c..867b346 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
@@ -589,11 +589,37 @@
"name": "push nanobench"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -602,7 +628,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -762,11 +829,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -775,7 +868,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1000,11 +1134,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skimage",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.list [START_DIR]/skimage",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skimage",
- "/sdcard/revenge_of_the_skiabot/images"
+ "[START_DIR]/skimage/.file3",
+ "/sdcard/revenge_of_the_skiabot/images/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -1013,7 +1173,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skimage /sdcard/revenge_of_the_skiabot/images"
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/file1",
+ "/sdcard/revenge_of_the_skiabot/images/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/images/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1189,11 +1390,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/svg",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.list [START_DIR]/svg",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/svg",
- "/sdcard/revenge_of_the_skiabot/svgs"
+ "[START_DIR]/svg/.file3",
+ "/sdcard/revenge_of_the_skiabot/svgs/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -1202,7 +1429,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/svg /sdcard/revenge_of_the_skiabot/svgs"
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/file1",
+ "/sdcard/revenge_of_the_skiabot/svgs/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/svgs/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/subdir/file2",
+ "~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 2f0b27a..dad677c 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
@@ -639,11 +639,37 @@
"name": "push nanobench"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -652,7 +678,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -812,11 +879,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -825,7 +918,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1001,11 +1135,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skimage",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.list [START_DIR]/skimage",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skimage",
- "/sdcard/revenge_of_the_skiabot/images"
+ "[START_DIR]/skimage/.file3",
+ "/sdcard/revenge_of_the_skiabot/images/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -1014,7 +1174,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skimage /sdcard/revenge_of_the_skiabot/images"
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/file1",
+ "/sdcard/revenge_of_the_skiabot/images/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skimage/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/images/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -1190,11 +1391,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/svg",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.list [START_DIR]/svg",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/svg",
- "/sdcard/revenge_of_the_skiabot/svgs"
+ "[START_DIR]/svg/.file3",
+ "/sdcard/revenge_of_the_skiabot/svgs/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -1203,7 +1430,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/svg /sdcard/revenge_of_the_skiabot/svgs"
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/file1",
+ "/sdcard/revenge_of_the_skiabot/svgs/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/svg/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/svgs/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json
index 7a1698e..93fce12 100644
--- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json
+++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json
@@ -334,11 +334,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/text_blob_traces"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/text_blob_traces/* /sdcard/revenge_of_the_skiabot/text_blob_traces"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/text_blob_traces",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/text_blob_traces/* /sdcard/revenge_of_the_skiabot/text_blob_traces.list [START_DIR]/text_blob_traces",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/text_blob_traces/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/text_blob_traces/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/text_blob_traces/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/text_blob_traces/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/text_blob_traces",
- "/sdcard/revenge_of_the_skiabot/text_blob_traces"
+ "[START_DIR]/text_blob_traces/.file3",
+ "/sdcard/revenge_of_the_skiabot/text_blob_traces/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -347,7 +373,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/text_blob_traces /sdcard/revenge_of_the_skiabot/text_blob_traces"
+ "name": "push [START_DIR]/text_blob_traces/* /sdcard/revenge_of_the_skiabot/text_blob_traces.push [START_DIR]/text_blob_traces/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/text_blob_traces/file1",
+ "/sdcard/revenge_of_the_skiabot/text_blob_traces/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/text_blob_traces/* /sdcard/revenge_of_the_skiabot/text_blob_traces.push [START_DIR]/text_blob_traces/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/text_blob_traces/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/text_blob_traces/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/text_blob_traces/* /sdcard/revenge_of_the_skiabot/text_blob_traces.push [START_DIR]/text_blob_traces/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -366,11 +433,37 @@
"name": "push [START_DIR]/tmp/TEXTTRACES_VERSION /sdcard/revenge_of_the_skiabot/TEXTTRACES_VERSION"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -379,7 +472,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -539,11 +673,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -552,7 +712,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -728,11 +929,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skimage",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.list [START_DIR]/skimage",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/skimage",
- "/sdcard/revenge_of_the_skiabot/images"
+ "[START_DIR]/skimage/.file3",
+ "/sdcard/revenge_of_the_skiabot/images/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -741,7 +968,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skimage /sdcard/revenge_of_the_skiabot/images"
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skimage/file1",
+ "/sdcard/revenge_of_the_skiabot/images/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skimage/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/images/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -917,11 +1185,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/svg",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.list [START_DIR]/svg",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/svg",
- "/sdcard/revenge_of_the_skiabot/svgs"
+ "[START_DIR]/svg/.file3",
+ "/sdcard/revenge_of_the_skiabot/svgs/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -930,7 +1224,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/svg /sdcard/revenge_of_the_skiabot/svgs"
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/svg/file1",
+ "/sdcard/revenge_of_the_skiabot/svgs/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/svg/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/svgs/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json b/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json
index 021836a..970001d 100644
--- a/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json
+++ b/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json
@@ -103,11 +103,37 @@
"name": "push dm"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -116,7 +142,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -276,11 +343,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/lotties"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/lottie-samples",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties.list [START_DIR]/lottie-samples",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/lottie-samples/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/lottie-samples/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/lottie-samples/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/lottie-samples/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/lottie-samples",
- "/sdcard/revenge_of_the_skiabot/lotties"
+ "[START_DIR]/lottie-samples/.file3",
+ "/sdcard/revenge_of_the_skiabot/lotties/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -289,7 +382,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/lottie-samples /sdcard/revenge_of_the_skiabot/lotties"
+ "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties.push [START_DIR]/lottie-samples/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/lottie-samples/file1",
+ "/sdcard/revenge_of_the_skiabot/lotties/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties.push [START_DIR]/lottie-samples/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/lottie-samples/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/lotties/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties.push [START_DIR]/lottie-samples/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json
index 64677ea..a8b8d8f 100644
--- a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json
+++ b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json
@@ -103,11 +103,37 @@
"name": "push dm"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -116,7 +142,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -276,11 +343,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/lotties"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/lottie-samples",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties.list [START_DIR]/lottie-samples",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/lottie-samples/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/lottie-samples/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/lottie-samples/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/lottie-samples/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/lottie-samples",
- "/sdcard/revenge_of_the_skiabot/lotties"
+ "[START_DIR]/lottie-samples/.file3",
+ "/sdcard/revenge_of_the_skiabot/lotties/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -289,7 +382,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/lottie-samples /sdcard/revenge_of_the_skiabot/lotties"
+ "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties.push [START_DIR]/lottie-samples/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/lottie-samples/file1",
+ "/sdcard/revenge_of_the_skiabot/lotties/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties.push [START_DIR]/lottie-samples/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/lottie-samples/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/lotties/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties.push [START_DIR]/lottie-samples/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json
index d17033c..ccad1cf 100644
--- a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json
+++ b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json
@@ -103,11 +103,37 @@
"name": "push dm"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -116,7 +142,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -276,11 +343,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/lotties"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/lottie-samples",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties.list [START_DIR]/lottie-samples",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/lottie-samples/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/lottie-samples/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/lottie-samples/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/lottie-samples/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/opt/infra-android/tools/adb",
"push",
- "[START_DIR]/lottie-samples",
- "/sdcard/revenge_of_the_skiabot/lotties"
+ "[START_DIR]/lottie-samples/.file3",
+ "/sdcard/revenge_of_the_skiabot/lotties/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -289,7 +382,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/lottie-samples /sdcard/revenge_of_the_skiabot/lotties"
+ "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties.push [START_DIR]/lottie-samples/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/lottie-samples/file1",
+ "/sdcard/revenge_of_the_skiabot/lotties/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties.push [START_DIR]/lottie-samples/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
+ "push",
+ "[START_DIR]/lottie-samples/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/lotties/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties.push [START_DIR]/lottie-samples/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench.json
index 8f5931f..fcd54d5 100644
--- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench.json
+++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench.json
@@ -219,11 +219,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -232,7 +258,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench.json
index 46aa5a0..d225ac8 100644
--- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench.json
+++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench.json
@@ -219,11 +219,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -232,7 +258,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
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 79027f4..223626f 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
@@ -202,11 +202,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -215,7 +241,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_ReduceOpsTaskSplitting_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_ReduceOpsTaskSplitting_Skpbench.json
index 3c6c392..d31c864 100644
--- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_ReduceOpsTaskSplitting_Skpbench.json
+++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_ReduceOpsTaskSplitting_Skpbench.json
@@ -202,11 +202,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -215,7 +241,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json
index 1dd267f..3cec2cf 100644
--- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json
+++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json
@@ -202,11 +202,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/mskp"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/mskp/* /sdcard/revenge_of_the_skiabot/mskp"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/mskp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/mskp/* /sdcard/revenge_of_the_skiabot/mskp.list [START_DIR]/mskp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/mskp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/mskp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/mskp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/mskp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/mskp",
- "/sdcard/revenge_of_the_skiabot/mskp"
+ "[START_DIR]/mskp/.file3",
+ "/sdcard/revenge_of_the_skiabot/mskp/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -215,7 +241,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/mskp /sdcard/revenge_of_the_skiabot/mskp"
+ "name": "push [START_DIR]/mskp/* /sdcard/revenge_of_the_skiabot/mskp.push [START_DIR]/mskp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/mskp/file1",
+ "/sdcard/revenge_of_the_skiabot/mskp/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/mskp/* /sdcard/revenge_of_the_skiabot/mskp.push [START_DIR]/mskp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/mskp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/mskp/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/mskp/* /sdcard/revenge_of_the_skiabot/mskp.push [START_DIR]/mskp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/skpbench.expected/trybot.json b/infra/bots/recipes/skpbench.expected/trybot.json
index a55747d..4510461 100644
--- a/infra/bots/recipes/skpbench.expected/trybot.json
+++ b/infra/bots/recipes/skpbench.expected/trybot.json
@@ -202,11 +202,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -215,7 +241,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm-Debug-All-Android_ASAN.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm-Debug-All-Android_ASAN.json
index d950f58..6130d4d 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm-Debug-All-Android_ASAN.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm-Debug-All-Android_ASAN.json
@@ -335,11 +335,37 @@
"name": "push dm"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -348,7 +374,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -508,11 +575,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -521,7 +614,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -697,11 +831,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skimage",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.list [START_DIR]/skimage",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/skimage",
- "/sdcard/revenge_of_the_skiabot/images"
+ "[START_DIR]/skimage/.file3",
+ "/sdcard/revenge_of_the_skiabot/images/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -710,7 +870,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skimage /sdcard/revenge_of_the_skiabot/images"
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skimage/file1",
+ "/sdcard/revenge_of_the_skiabot/images/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skimage/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/images/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -886,11 +1087,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/svg",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.list [START_DIR]/svg",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/svg",
- "/sdcard/revenge_of_the_skiabot/svgs"
+ "[START_DIR]/svg/.file3",
+ "/sdcard/revenge_of_the_skiabot/svgs/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -899,7 +1126,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/svg /sdcard/revenge_of_the_skiabot/svgs"
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/svg/file1",
+ "/sdcard/revenge_of_the_skiabot/svgs/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/svg/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/svgs/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json
index a4a8d97..9198dd5 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json
@@ -345,11 +345,37 @@
"name": "push dm"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skia/resources",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.list [START_DIR]/skia/resources",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skia/resources/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/skia/resources",
- "/sdcard/revenge_of_the_skiabot/resources"
+ "[START_DIR]/skia/resources/.file3",
+ "/sdcard/revenge_of_the_skiabot/resources/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -358,7 +384,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skia/resources /sdcard/revenge_of_the_skiabot/resources"
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skia/resources/file1",
+ "/sdcard/revenge_of_the_skiabot/resources/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skia/resources/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/resources/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources.push [START_DIR]/skia/resources/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -518,11 +585,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skp",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.list [START_DIR]/skp",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skp/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/skp",
- "/sdcard/revenge_of_the_skiabot/skps"
+ "[START_DIR]/skp/.file3",
+ "/sdcard/revenge_of_the_skiabot/skps/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -531,7 +624,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skp /sdcard/revenge_of_the_skiabot/skps"
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skp/file1",
+ "/sdcard/revenge_of_the_skiabot/skps/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skp/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/skps/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps.push [START_DIR]/skp/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -707,11 +841,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/skimage",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.list [START_DIR]/skimage",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/skimage/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/skimage",
- "/sdcard/revenge_of_the_skiabot/images"
+ "[START_DIR]/skimage/.file3",
+ "/sdcard/revenge_of_the_skiabot/images/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -720,7 +880,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/skimage /sdcard/revenge_of_the_skiabot/images"
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skimage/file1",
+ "/sdcard/revenge_of_the_skiabot/images/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/skimage/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/images/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images.push [START_DIR]/skimage/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -896,11 +1097,37 @@
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
{
+ "cmd": [],
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[START_DIR]/svg",
+ "--recursive"
+ ],
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.list [START_DIR]/svg",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.file3@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/.ignore/file4@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/file1@@@",
+ "@@@STEP_LOG_LINE@listdir@[START_DIR]/svg/subdir/file2@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
- "[START_DIR]/svg",
- "/sdcard/revenge_of_the_skiabot/svgs"
+ "[START_DIR]/svg/.file3",
+ "/sdcard/revenge_of_the_skiabot/svgs/.file3"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -909,7 +1136,48 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
- "name": "push [START_DIR]/svg /sdcard/revenge_of_the_skiabot/svgs"
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/.file3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/svg/file1",
+ "/sdcard/revenge_of_the_skiabot/svgs/file1"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/file1",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/usr/bin/adb.1.0.35",
+ "push",
+ "[START_DIR]/svg/subdir/file2",
+ "/sdcard/revenge_of_the_skiabot/svgs/subdir/file2"
+ ],
+ "cwd": "[START_DIR]/skia",
+ "env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs.push [START_DIR]/svg/subdir/file2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
