Index: infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json |
diff --git a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json |
similarity index 94% |
copy from infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json |
copy to infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json |
index 78196fcf6b11a14256da9f9f8dff32fd967e6bab..73c442c353b5102d684373235370c92d441aacd5 100644 |
--- a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json |
+++ b/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json |
@@ -227,6 +227,76 @@ |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "read SKP_VERSION", |
+ "stdout": "/path/to/tmp/" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
+ "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", |
+ "/path/to/tmp/" |
+ ], |
+ "name": "Get downloaded skimage VERSION" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
+ "42", |
+ "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" |
+ ], |
+ "name": "write SK_IMAGE_VERSION" |
+ }, |
+ { |
+ "cmd": [ |
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", |
+ "shell", |
+ "cat", |
+ "/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION" |
+ ], |
+ "env": { |
+ "BUILDTYPE": "Debug", |
+ "CHROME_HEADLESS": "1", |
+ "SKIA_OUT": "[SLAVE_BUILD]/out" |
+ }, |
+ "name": "read SK_IMAGE_VERSION", |
+ "stdout": "/path/to/tmp/" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
+ "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", |
+ "/path/to/tmp/" |
+ ], |
+ "name": "Get downloaded SVG VERSION" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
+ "42", |
+ "[SLAVE_BUILD]/tmp/SVG_VERSION" |
+ ], |
+ "name": "write SVG_VERSION" |
+ }, |
+ { |
+ "cmd": [ |
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", |
+ "shell", |
+ "cat", |
+ "/storage/emulated/legacy/skiabot/skia_tmp_dir/SVG_VERSION" |
+ ], |
+ "env": { |
+ "BUILDTYPE": "Debug", |
+ "CHROME_HEADLESS": "1", |
+ "SKIA_OUT": "[SLAVE_BUILD]/out" |
+ }, |
+ "name": "read SVG_VERSION", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
"step returned non-zero exit code: 1", |
@@ -239,14 +309,14 @@ |
"shell", |
"rm", |
"-f", |
- "/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION" |
+ "/storage/emulated/legacy/skiabot/skia_tmp_dir/SVG_VERSION" |
], |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
- "name": "rm SKP_VERSION" |
+ "name": "rm SVG_VERSION" |
}, |
{ |
"cmd": [ |
@@ -254,14 +324,14 @@ |
"shell", |
"rm", |
"-r", |
- "/storage/emulated/legacy/skiabot/skia_skp/skps" |
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs" |
], |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
- "name": "rmdir skps" |
+ "name": "rmdir svgs" |
}, |
{ |
"cmd": [ |
@@ -270,7 +340,7 @@ |
"if", |
"[", |
"-e", |
- "/storage/emulated/legacy/skiabot/skia_skp/skps", |
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs", |
"];", |
"then", |
"echo", |
@@ -282,7 +352,7 @@ |
"CHROME_HEADLESS": "1", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
- "name": "exists skps", |
+ "name": "exists svgs", |
"stdout": "/path/to/tmp/" |
}, |
{ |
@@ -291,21 +361,21 @@ |
"shell", |
"mkdir", |
"-p", |
- "/storage/emulated/legacy/skiabot/skia_skp/skps" |
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs" |
], |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
- "name": "mkdir skps" |
+ "name": "mkdir svgs" |
}, |
{ |
"cmd": [ |
"[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_push_if_needed", |
"--verbose", |
- "[SLAVE_BUILD]/skp", |
- "/storage/emulated/legacy/skiabot/skia_skp/skps" |
+ "[SLAVE_BUILD]/svg", |
+ "/storage/emulated/legacy/skiabot/skia_svg/svgs" |
], |
"env": { |
"ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", |
@@ -315,56 +385,21 @@ |
"SKIA_ANDROID_VERBOSE_SETUP": "1", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
- "name": "push skp" |
+ "name": "push svg" |
}, |
{ |
"cmd": [ |
"[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", |
"push", |
- "[SLAVE_BUILD]/tmp/SKP_VERSION", |
- "/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION" |
+ "[SLAVE_BUILD]/tmp/SVG_VERSION", |
+ "/storage/emulated/legacy/skiabot/skia_tmp_dir/SVG_VERSION" |
], |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
- "name": "push SKP_VERSION" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", |
- "/path/to/tmp/" |
- ], |
- "name": "Get downloaded skimage VERSION" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "42", |
- "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" |
- ], |
- "name": "write SK_IMAGE_VERSION" |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", |
- "shell", |
- "cat", |
- "/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION" |
- ], |
- "env": { |
- "BUILDTYPE": "Debug", |
- "CHROME_HEADLESS": "1", |
- "SKIA_OUT": "[SLAVE_BUILD]/out" |
- }, |
- "name": "read SK_IMAGE_VERSION", |
- "stdout": "/path/to/tmp/" |
+ "name": "push SVG_VERSION" |
}, |
{ |
"cmd": [ |