diff options
55 files changed, 4828 insertions, 3 deletions
diff --git a/infra/bots/recipe_modules/flavor/android_flavor.py b/infra/bots/recipe_modules/flavor/android_flavor.py index 85ccef3fb8..c896f058b1 100644 --- a/infra/bots/recipe_modules/flavor/android_flavor.py +++ b/infra/bots/recipe_modules/flavor/android_flavor.py @@ -267,6 +267,7 @@ class AndroidFlavorUtils(default_flavor.DefaultFlavorUtils): resource_dir=prefix + 'resources', images_dir=prefix + 'images', skp_dir=prefix + 'skp/skps', + svg_dir=prefix + 'svg/svgs', tmp_dir=prefix + 'tmp_dir') self._has_root = self.has_root() diff --git a/infra/bots/recipe_modules/flavor/api.py b/infra/bots/recipe_modules/flavor/api.py index 0e8411de63..433f11b5b9 100644 --- a/infra/bots/recipe_modules/flavor/api.py +++ b/infra/bots/recipe_modules/flavor/api.py @@ -20,10 +20,12 @@ from . import xsan_flavor TEST_EXPECTED_SKP_VERSION = '42' +TEST_EXPECTED_SVG_VERSION = '42' TEST_EXPECTED_SK_IMAGE_VERSION = '42' VERSION_FILE_SK_IMAGE = 'SK_IMAGE_VERSION' VERSION_FILE_SKP = 'SKP_VERSION' +VERSION_FILE_SVG = 'SVG_VERSION' VERSION_NONE = -1 @@ -133,6 +135,7 @@ class SkiaFlavorApi(recipe_api.RecipeApi): self._copy_skps() self._copy_images() + self._copy_svgs() def cleanup_steps(self): return self._f.cleanup_steps() @@ -209,3 +212,28 @@ class SkiaFlavorApi(recipe_api.RecipeApi): test_actual_version=self.m.properties.get( 'test_downloaded_skp_version', TEST_EXPECTED_SKP_VERSION)) return version + + def _copy_svgs(self): + """Download and copy the SVGs if needed.""" + version_file = self.m.vars.infrabots_dir.join( + 'assets', 'svg', 'VERSION') + test_data = self.m.properties.get( + 'test_downloaded_svg_version', TEST_EXPECTED_SVG_VERSION) + version = self.m.run.readfile( + version_file, + name='Get downloaded SVG VERSION', + test_data=test_data).rstrip() + self.m.run.writefile( + self.m.path.join(self.m.vars.tmp_dir, VERSION_FILE_SVG), + version) + self._copy_dir( + version, + VERSION_FILE_SVG, + self.m.vars.tmp_dir, + self.m.vars.local_svg_dir, + self.device_dirs.svg_dir, + test_expected_version=self.m.properties.get( + 'test_downloaded_svg_version', TEST_EXPECTED_SVG_VERSION), + test_actual_version=self.m.properties.get( + 'test_downloaded_svg_version', TEST_EXPECTED_SVG_VERSION)) + return version diff --git a/infra/bots/recipe_modules/flavor/default_flavor.py b/infra/bots/recipe_modules/flavor/default_flavor.py index 3670457474..80a0a171df 100644 --- a/infra/bots/recipe_modules/flavor/default_flavor.py +++ b/infra/bots/recipe_modules/flavor/default_flavor.py @@ -22,12 +22,14 @@ class DeviceDirs(object): resource_dir, images_dir, skp_dir, + svg_dir, tmp_dir): self._dm_dir = dm_dir self._perf_data_dir = perf_data_dir self._resource_dir = resource_dir self._images_dir = images_dir self._skp_dir = skp_dir + self._svg_dir = svg_dir self._tmp_dir = tmp_dir @property @@ -53,6 +55,10 @@ class DeviceDirs(object): return self._skp_dir @property + def svg_dir(self): + return self._svg_dir + + @property def tmp_dir(self): return self._tmp_dir @@ -220,6 +226,7 @@ class DefaultFlavorUtils(object): resource_dir=self.m.vars.resource_dir, images_dir=self.m.vars.images_dir, skp_dir=self.m.vars.local_skp_dir, + svg_dir=self.m.vars.local_svg_dir, tmp_dir=self.m.vars.tmp_dir) def cleanup_steps(self): diff --git a/infra/bots/recipe_modules/flavor/ios_flavor.py b/infra/bots/recipe_modules/flavor/ios_flavor.py index 7708d5dccd..5d33d1c4df 100644 --- a/infra/bots/recipe_modules/flavor/ios_flavor.py +++ b/infra/bots/recipe_modules/flavor/ios_flavor.py @@ -119,6 +119,7 @@ class iOSFlavorUtils(default_flavor.DefaultFlavorUtils): resource_dir=prefix + 'resources', images_dir=prefix + 'images', skp_dir=prefix + 'skp/skps', + svg_dir=prefix + 'svg/svgs', tmp_dir=prefix + 'tmp_dir') self.m.run( @@ -130,7 +131,7 @@ class iOSFlavorUtils(default_flavor.DefaultFlavorUtils): def cleanup_steps(self): """Run any device-specific cleanup steps.""" - if self.m.vars.role in (self.m.builder_name_schema.BUILDER_ROLE_TEST, + if self.m.vars.role in (self.m.builder_name_schema.BUILDER_ROLE_TEST, self.m.builder_name_schema.BUILDER_ROLE_PERF): self.m.run( self.m.step, diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py index 3e0c7172de..e2d0ed99c0 100644 --- a/infra/bots/recipe_modules/vars/api.py +++ b/infra/bots/recipe_modules/vars/api.py @@ -76,6 +76,7 @@ class SkiaVarsApi(recipe_api.RecipeApi): self.skia_out = self.skia_dir.join('out', self.builder_name) self.swarming_out_dir = self.make_path(self.m.properties['swarm_out_dir']) self.local_skp_dir = self.slave_dir.join('skp') + self.local_svg_dir = self.slave_dir.join('svg') if not self.is_compile_bot: self.skia_out = self.slave_dir.join('out') self.tmp_dir = self.m.path['slave_build'].join('tmp') diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json index 8a4883a076..f40e0b4045 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json @@ -172,6 +172,41 @@ }, { "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": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "read SVG_VERSION", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", "shell", "rm", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json index fdd1ec6555..95938f157c 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json @@ -266,6 +266,41 @@ }, { "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/" + }, + { + "cmd": [ "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_run_skia", "--verbose", "--logcat", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug.json index 85380493c2..82a3ebf88d 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug.json @@ -266,6 +266,41 @@ }, { "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/" + }, + { + "cmd": [ "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_run_skia", "--verbose", "--logcat", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json index 6048d42d8c..b96ba531f6 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json @@ -266,6 +266,41 @@ }, { "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": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "read SVG_VERSION", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", "shell", "rm", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json index 9d1e16ca83..f074345b2a 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json @@ -266,6 +266,41 @@ }, { "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": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "read SVG_VERSION", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", "shell", "rm", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release.json index 18303fdb78..bebe883dbb 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release.json @@ -266,6 +266,41 @@ }, { "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": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "read SVG_VERSION", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", "shell", "rm", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json b/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json index 044e4bfd7a..e34c1c473c 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json @@ -43,6 +43,26 @@ "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": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN/data" ], diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index 4c60a69edb..f89798ab79 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -43,6 +43,26 @@ "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": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data" ], diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json index 074f38fad2..af30b889ef 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json @@ -43,6 +43,26 @@ "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": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data" ], diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json index cfaa862d6f..d224ad4615 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json @@ -41,6 +41,26 @@ }, { "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]\\out\\Debug_x64\\nanobench", "--undefok", "-i", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json index 5c52ef790c..90e977a78c 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json @@ -43,6 +43,26 @@ "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": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release\\data" ], diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json index 6aa3a5102e..4bc4304d70 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json @@ -43,6 +43,26 @@ "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": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data" ], diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json b/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json index 3608414fdd..66e4c8cb1d 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json @@ -229,6 +229,107 @@ }, { "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]/skia/platform_tools/ios/bin/ios_cat_file", + "skiabot/skia_tmp_dir/SVG_VERSION" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out", + "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + }, + "name": "read SVG_VERSION", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "skiabot/skia_tmp_dir/SVG_VERSION" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out", + "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + }, + "name": "rm skiabot/skia_tmp_dir/SVG_VERSION" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "skiabot/skia_svg/svgs" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out", + "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + }, + "name": "rmdir skiabot/skia_svg/svgs" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "skiabot/skia_svg/svgs" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out", + "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + }, + "name": "mkdir skiabot/skia_svg/svgs" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[SLAVE_BUILD]/svg", + "skiabot/skia_svg/svgs" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out", + "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + }, + "name": "push svg to svgs" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", + "[SLAVE_BUILD]/tmp/SVG_VERSION", + "skiabot/skia_tmp_dir/SVG_VERSION" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out", + "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + }, + "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION" + }, + { + "cmd": [ "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_run_skia", "--nanobench", "--undefok", diff --git a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json index 71f3f19834..5ebf500484 100644 --- a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json @@ -43,6 +43,26 @@ "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": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data" ], diff --git a/infra/bots/recipes/swarm_perf.py b/infra/bots/recipes/swarm_perf.py index 858c1e91a1..60ebaee88b 100644 --- a/infra/bots/recipes/swarm_perf.py +++ b/infra/bots/recipes/swarm_perf.py @@ -252,6 +252,9 @@ def GenTests(api): 'read SK_IMAGE_VERSION', stdout=api.raw_io.output('42')) + api.step_data( + 'read SVG_VERSION', + stdout=api.raw_io.output('42')) + + api.step_data( 'which adb', retcode=1) ) @@ -318,6 +321,8 @@ def GenTests(api): 'skimage', 'VERSION'), api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), + api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + 'svg', 'VERSION'), api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') ) + api.platform('win', 64) diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json index d7997dce2a..305cb64d14 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json @@ -268,6 +268,41 @@ "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": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "read SVG_VERSION", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json index c3d9742984..8dd7b597d5 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json @@ -174,6 +174,41 @@ "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/" + }, + { + "cmd": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json index c80bfba460..d895dd7889 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json @@ -268,6 +268,41 @@ "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/" + }, + { + "cmd": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json index a3a01209b3..5fcc260ea3 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json @@ -268,6 +268,41 @@ "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": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "read SVG_VERSION", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json index dd3017038c..9827a8ff7f 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json @@ -268,6 +268,41 @@ "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/" + }, + { + "cmd": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json index ee62cf9883..93695e49e8 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json @@ -268,6 +268,41 @@ "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/" + }, + { + "cmd": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json index 19f32d99d0..3131aefa50 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json @@ -268,6 +268,41 @@ "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/" + }, + { + "cmd": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json index 60da73b062..cafd3dce65 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json @@ -268,6 +268,41 @@ "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": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "read SVG_VERSION", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json index cfeeea1a60..ad1176b906 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json @@ -43,6 +43,26 @@ "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": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json index ddf17ec564..6b254a14f6 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json @@ -43,6 +43,26 @@ "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": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json index 208141d575..82ce356fc5 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json @@ -43,6 +43,26 @@ "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": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json index f19e36b261..8c998e32af 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json @@ -41,6 +41,26 @@ }, { "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]/skia/tools/llvm_coverage_build", "dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json index c41e64aef0..98f21b424a 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json @@ -43,6 +43,26 @@ "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": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json index e36b25fe69..ab7f7aea7e 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json @@ -41,6 +41,26 @@ }, { "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]/out/Debug/dm", "--undefok", "--resourcePath", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json index 3d42f26d50..100fa867fe 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json @@ -43,6 +43,26 @@ "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": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json new file mode 100644 index 0000000000..465d0b7806 --- /dev/null +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json @@ -0,0 +1,442 @@ +[ + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "/path/to/tmp/" + ], + "name": "Get downloaded SKP VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "42", + "[SLAVE_BUILD]/tmp/SKP_VERSION" + ], + "name": "write 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": [ + "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": [ + "python", + "-u", + "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", + "[CUSTOM_[SWARM_OUT_DIR]]/dm" + ], + "env": { + "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + }, + "name": "rmtree dm", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", + "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", + "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "511" + ], + "name": "makedirs dm", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[SLAVE_BUILD]/tmp", + "511" + ], + "name": "makedirs tmp_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", + "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + ], + "cwd": "[SLAVE_BUILD]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "get uninteresting hashes", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import contextlib@@@", + "@@@STEP_LOG_LINE@python.inline@import math@@@", + "@@@STEP_LOG_LINE@python.inline@import socket@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@import time@@@", + "@@@STEP_LOG_LINE@python.inline@import urllib2@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@HASHES_URL = 'https://gold.skia.org/_/hashes'@@@", + "@@@STEP_LOG_LINE@python.inline@RETRIES = 5@@@", + "@@@STEP_LOG_LINE@python.inline@TIMEOUT = 60@@@", + "@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 15@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@socket.setdefaulttimeout(TIMEOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@for retry in range(RETRIES):@@@", + "@@@STEP_LOG_LINE@python.inline@ try:@@@", + "@@@STEP_LOG_LINE@python.inline@ with contextlib.closing(@@@", + "@@@STEP_LOG_LINE@python.inline@ urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:@@@", + "@@@STEP_LOG_LINE@python.inline@ hashes = w.read()@@@", + "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[1], 'w') as f:@@@", + "@@@STEP_LOG_LINE@python.inline@ f.write(hashes)@@@", + "@@@STEP_LOG_LINE@python.inline@ break@@@", + "@@@STEP_LOG_LINE@python.inline@ except Exception as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ print 'Failed to get uninteresting hashes from %s:' % HASHES_URL@@@", + "@@@STEP_LOG_LINE@python.inline@ print e@@@", + "@@@STEP_LOG_LINE@python.inline@ if retry == RETRIES:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise@@@", + "@@@STEP_LOG_LINE@python.inline@ waittime = WAIT_BASE * math.pow(2, retry)@@@", + "@@@STEP_LOG_LINE@python.inline@ print 'Retry in %d seconds.' % waittime@@@", + "@@@STEP_LOG_LINE@python.inline@ time.sleep(waittime)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "catchsegv", + "[SLAVE_BUILD]/out/Release/dm", + "--undefok", + "--resourcePath", + "[SLAVE_BUILD]/skia/resources", + "--skps", + "[SLAVE_BUILD]/skp", + "--images", + "[SLAVE_BUILD]/skimage/dm", + "--colorImages", + "[SLAVE_BUILD]/skimage/colorspace", + "--nameByHash", + "--properties", + "gitHash", + "abc123", + "master", + "client.skia", + "builder", + "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared", + "build_number", + "5", + "--svgs", + "[SLAVE_BUILD]/svg", + "--key", + "arch", + "x86_64", + "compiler", + "GCC", + "configuration", + "Release", + "cpu_or_gpu", + "CPU", + "cpu_or_gpu_value", + "AVX2", + "extra_config", + "Shared", + "model", + "GCE", + "os", + "Ubuntu", + "--uninterestingHashesFile", + "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "--writePath", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "--nogpu", + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "pdf", + "msaa16", + "f16", + "srgb", + "sp-8888", + "2ndpic-8888", + "lite-8888", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "colorImage", + "svg", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "lite-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "dm" + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json index 6fc8f4eb5f..de32817bdc 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json @@ -41,6 +41,26 @@ }, { "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]/out/Release/dm", "--undefok", "--resourcePath", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index 9a8f103495..3c98cdf82c 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -41,6 +41,26 @@ }, { "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": [ "valgrind", "--gen-suppressions=all", "--leak-check=full", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json b/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json index be5e6172b1..3330f22cfb 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json @@ -43,6 +43,26 @@ "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": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json index ae673933ee..6e09eecf33 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json @@ -43,6 +43,26 @@ "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": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json index 8c18e2f8b4..d9396dac3c 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -43,6 +43,26 @@ "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": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json index 08dff46352..83500c9fd8 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json @@ -231,6 +231,107 @@ "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]/skia/platform_tools/ios/bin/ios_cat_file", + "skiabot/skia_tmp_dir/SVG_VERSION" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out", + "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + }, + "name": "read SVG_VERSION", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "skiabot/skia_tmp_dir/SVG_VERSION" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out", + "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + }, + "name": "rm skiabot/skia_tmp_dir/SVG_VERSION" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "skiabot/skia_svg/svgs" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out", + "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + }, + "name": "rmdir skiabot/skia_svg/svgs" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "skiabot/skia_svg/svgs" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out", + "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + }, + "name": "mkdir skiabot/skia_svg/svgs" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[SLAVE_BUILD]/svg", + "skiabot/skia_svg/svgs" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out", + "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + }, + "name": "push svg to svgs" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", + "[SLAVE_BUILD]/tmp/SVG_VERSION", + "skiabot/skia_tmp_dir/SVG_VERSION" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out", + "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + }, + "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION" + }, + { + "cmd": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/adb_in_path.json b/infra/bots/recipes/swarm_test.expected/adb_in_path.json index d773c74584..34e46b45c3 100644 --- a/infra/bots/recipes/swarm_test.expected/adb_in_path.json +++ b/infra/bots/recipes/swarm_test.expected/adb_in_path.json @@ -264,6 +264,41 @@ "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": [ + "/usr/bin/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/" + }, + { + "cmd": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/big_issue_number.json b/infra/bots/recipes/swarm_test.expected/big_issue_number.json index 32abbffed4..8a9d554347 100644 --- a/infra/bots/recipes/swarm_test.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_test.expected/big_issue_number.json @@ -43,6 +43,26 @@ "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": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json b/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json index 2368ea9458..ae0133efe2 100644 --- a/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json +++ b/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json @@ -366,6 +366,41 @@ "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/" + }, + { + "cmd": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json b/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json index 8976e56309..89f0194686 100644 --- a/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json +++ b/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json @@ -366,6 +366,41 @@ "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/" + }, + { + "cmd": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json b/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json new file mode 100644 index 0000000000..98773bb88f --- /dev/null +++ b/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json @@ -0,0 +1,1042 @@ +[ + { + "cmd": [ + "which", + "adb" + ], + "name": "which adb", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "step returned non-zero exit code: 1", + "@@@STEP_EXCEPTION@@@" + ] + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "wait for device (1)" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "wait for charge (1)" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "echo", + "$EXTERNAL_STORAGE" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "get EXTERNAL_STORAGE dir", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "root" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "adb root", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "sleep", + "10" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "wait" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "wait for device (2)" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "wait for charge (2)" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_kill_skia", + "--verbose" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "kill skia" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "stop" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "stop shell" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "dumpsys", + "batteryproperties" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "starting battery stats" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "cat", + "/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "cat scaling_governor" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "cat", + "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "cat cpu_freq" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_push_if_needed", + "--verbose", + "[SLAVE_BUILD]/skia/resources", + "/storage/emulated/legacy/skiabot/skia_resources" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "push resources" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "/path/to/tmp/" + ], + "name": "Get downloaded SKP VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "42", + "[SLAVE_BUILD]/tmp/SKP_VERSION" + ], + "name": "write SKP_VERSION" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "cat", + "/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "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/" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "rm", + "-f", + "/storage/emulated/legacy/skiabot/skia_tmp_dir/SVG_VERSION" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "rm SVG_VERSION" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "rm", + "-r", + "/storage/emulated/legacy/skiabot/skia_svg/svgs" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "rmdir svgs" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "if", + "[", + "-e", + "/storage/emulated/legacy/skiabot/skia_svg/svgs", + "];", + "then", + "echo", + "FILE_EXISTS;", + "fi" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "exists svgs", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "mkdir", + "-p", + "/storage/emulated/legacy/skiabot/skia_svg/svgs" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "mkdir svgs" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_push_if_needed", + "--verbose", + "[SLAVE_BUILD]/svg", + "/storage/emulated/legacy/skiabot/skia_svg/svgs" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "push svg" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "push", + "[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 SVG_VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", + "[CUSTOM_[SWARM_OUT_DIR]]/dm" + ], + "env": { + "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + }, + "name": "rmtree dm", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", + "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", + "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "511" + ], + "name": "makedirs dm", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "rm", + "-r", + "/storage/emulated/legacy/skiabot/skia_dm" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "rmdir skia_dm" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "if", + "[", + "-e", + "/storage/emulated/legacy/skiabot/skia_dm", + "];", + "then", + "echo", + "FILE_EXISTS;", + "fi" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "exists skia_dm", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "mkdir", + "-p", + "/storage/emulated/legacy/skiabot/skia_dm" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "mkdir skia_dm" + }, + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[SLAVE_BUILD]/tmp", + "511" + ], + "name": "makedirs tmp_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", + "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + ], + "cwd": "[SLAVE_BUILD]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "get uninteresting hashes", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import contextlib@@@", + "@@@STEP_LOG_LINE@python.inline@import math@@@", + "@@@STEP_LOG_LINE@python.inline@import socket@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@import time@@@", + "@@@STEP_LOG_LINE@python.inline@import urllib2@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@HASHES_URL = 'https://gold.skia.org/_/hashes'@@@", + "@@@STEP_LOG_LINE@python.inline@RETRIES = 5@@@", + "@@@STEP_LOG_LINE@python.inline@TIMEOUT = 60@@@", + "@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 15@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@socket.setdefaulttimeout(TIMEOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@for retry in range(RETRIES):@@@", + "@@@STEP_LOG_LINE@python.inline@ try:@@@", + "@@@STEP_LOG_LINE@python.inline@ with contextlib.closing(@@@", + "@@@STEP_LOG_LINE@python.inline@ urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:@@@", + "@@@STEP_LOG_LINE@python.inline@ hashes = w.read()@@@", + "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[1], 'w') as f:@@@", + "@@@STEP_LOG_LINE@python.inline@ f.write(hashes)@@@", + "@@@STEP_LOG_LINE@python.inline@ break@@@", + "@@@STEP_LOG_LINE@python.inline@ except Exception as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ print 'Failed to get uninteresting hashes from %s:' % HASHES_URL@@@", + "@@@STEP_LOG_LINE@python.inline@ print e@@@", + "@@@STEP_LOG_LINE@python.inline@ if retry == RETRIES:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise@@@", + "@@@STEP_LOG_LINE@python.inline@ waittime = WAIT_BASE * math.pow(2, retry)@@@", + "@@@STEP_LOG_LINE@python.inline@ print 'Retry in %d seconds.' % waittime@@@", + "@@@STEP_LOG_LINE@python.inline@ time.sleep(waittime)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "push", + "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "/storage/emulated/legacy/skiabot/skia_tmp_dir/uninteresting_hashes.txt" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "push uninteresting_hashes.txt" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_run_skia", + "--verbose", + "--logcat", + "-d", + "arm_v7_neon", + "-t", + "Debug", + "dm", + "--undefok", + "--resourcePath", + "/storage/emulated/legacy/skiabot/skia_resources", + "--skps", + "/storage/emulated/legacy/skiabot/skia_skp/skps", + "--images", + "/storage/emulated/legacy/skiabot/skia_images/dm", + "--colorImages", + "/storage/emulated/legacy/skiabot/skia_images/colorspace", + "--nameByHash", + "--properties", + "gitHash", + "abc123", + "master", + "client.skia", + "builder", + "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug", + "build_number", + "6", + "--key", + "arch", + "Arm7", + "compiler", + "GCC", + "configuration", + "Debug", + "cpu_or_gpu", + "GPU", + "cpu_or_gpu_value", + "Tegra3", + "model", + "Nexus7", + "os", + "Android", + "--uninterestingHashesFile", + "/storage/emulated/legacy/skiabot/skia_tmp_dir/uninteresting_hashes.txt", + "--writePath", + "/storage/emulated/legacy/skiabot/skia_dm", + "--nocpu", + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "colorImage", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "_", + "test", + "_", + "GrShape", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "serialize-8888", + "gm", + "_", + "verylargebitmap", + "serialize-8888", + "gm", + "_", + "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "lite-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "_", + "image", + "_", + "interlaced1.png", + "_", + "image", + "_", + "interlaced2.png", + "_", + "image", + "_", + "interlaced3.png", + "_", + "image", + "_", + ".arw", + "_", + "image", + "_", + ".cr2", + "_", + "image", + "_", + ".dng", + "_", + "image", + "_", + ".nef", + "_", + "image", + "_", + ".nrw", + "_", + "image", + "_", + ".orf", + "_", + "image", + "_", + ".raf", + "_", + "image", + "_", + ".rw2", + "_", + "image", + "_", + ".pef", + "_", + "image", + "_", + ".srw", + "_", + "image", + "_", + ".ARW", + "_", + "image", + "_", + ".CR2", + "_", + "image", + "_", + ".DNG", + "_", + "image", + "_", + ".NEF", + "_", + "image", + "_", + ".NRW", + "_", + "image", + "_", + ".ORF", + "_", + "image", + "_", + ".RAF", + "_", + "image", + "_", + ".RW2", + "_", + "image", + "_", + ".PEF", + "_", + "image", + "_", + ".SRW" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "dm" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_pull_if_needed", + "--verbose", + "/storage/emulated/legacy/skiabot/skia_dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "pull skia_dm" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "dumpsys", + "batteryproperties" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "final battery stats" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "reboot" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "reboot" + }, + { + "cmd": [ + "sleep", + "10" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "wait for reboot" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "wait for device (3)" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "wait for charge (3)" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "kill-server" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "kill-server" + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_test.expected/failed_dm.json b/infra/bots/recipes/swarm_test.expected/failed_dm.json index 4e6c0b4283..d8a77b4cde 100644 --- a/infra/bots/recipes/swarm_test.expected/failed_dm.json +++ b/infra/bots/recipes/swarm_test.expected/failed_dm.json @@ -43,6 +43,26 @@ "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": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json index 8a6b20349d..eb8048fa35 100644 --- a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json +++ b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json @@ -268,6 +268,41 @@ "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/" + }, + { + "cmd": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json index 78196fcf6b..fa8ed7153c 100644 --- a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json +++ b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json @@ -370,6 +370,41 @@ "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/" + }, + { + "cmd": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json index df335d07ce..27b57d4f48 100644 --- a/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json +++ b/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json @@ -370,6 +370,41 @@ "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/" + }, + { + "cmd": [ + "python", + "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json new file mode 100644 index 0000000000..73c442c353 --- /dev/null +++ b/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json @@ -0,0 +1,1046 @@ +[ + { + "cmd": [ + "which", + "adb" + ], + "name": "which adb", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "step returned non-zero exit code: 1", + "@@@STEP_EXCEPTION@@@" + ] + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "wait for device (1)" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "wait for charge (1)" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "echo", + "$EXTERNAL_STORAGE" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "get EXTERNAL_STORAGE dir", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "root" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "adb root", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "sleep", + "10" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "wait" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "wait for device (2)" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "wait for charge (2)" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_kill_skia", + "--verbose" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "kill skia" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "stop" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "stop shell" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "dumpsys", + "batteryproperties" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "starting battery stats" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "cat", + "/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "cat scaling_governor" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "cat", + "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "cat cpu_freq" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_push_if_needed", + "--verbose", + "[SLAVE_BUILD]/skia/resources", + "/storage/emulated/legacy/skiabot/skia_resources" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "push resources" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "/path/to/tmp/" + ], + "name": "Get downloaded SKP VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "42", + "[SLAVE_BUILD]/tmp/SKP_VERSION" + ], + "name": "write SKP_VERSION" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "cat", + "/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "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", + "@@@STEP_EXCEPTION@@@" + ] + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "rm", + "-f", + "/storage/emulated/legacy/skiabot/skia_tmp_dir/SVG_VERSION" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "rm SVG_VERSION" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "rm", + "-r", + "/storage/emulated/legacy/skiabot/skia_svg/svgs" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "rmdir svgs" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "if", + "[", + "-e", + "/storage/emulated/legacy/skiabot/skia_svg/svgs", + "];", + "then", + "echo", + "FILE_EXISTS;", + "fi" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "exists svgs", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "mkdir", + "-p", + "/storage/emulated/legacy/skiabot/skia_svg/svgs" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "mkdir svgs" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_push_if_needed", + "--verbose", + "[SLAVE_BUILD]/svg", + "/storage/emulated/legacy/skiabot/skia_svg/svgs" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "push svg" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "push", + "[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 SVG_VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", + "[CUSTOM_[SWARM_OUT_DIR]]/dm" + ], + "env": { + "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + }, + "name": "rmtree dm", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", + "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", + "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "511" + ], + "name": "makedirs dm", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "rm", + "-r", + "/storage/emulated/legacy/skiabot/skia_dm" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "rmdir skia_dm" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "if", + "[", + "-e", + "/storage/emulated/legacy/skiabot/skia_dm", + "];", + "then", + "echo", + "FILE_EXISTS;", + "fi" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "exists skia_dm", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "mkdir", + "-p", + "/storage/emulated/legacy/skiabot/skia_dm" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "mkdir skia_dm" + }, + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[SLAVE_BUILD]/tmp", + "511" + ], + "name": "makedirs tmp_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", + "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + ], + "cwd": "[SLAVE_BUILD]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "get uninteresting hashes", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import contextlib@@@", + "@@@STEP_LOG_LINE@python.inline@import math@@@", + "@@@STEP_LOG_LINE@python.inline@import socket@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@import time@@@", + "@@@STEP_LOG_LINE@python.inline@import urllib2@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@HASHES_URL = 'https://gold.skia.org/_/hashes'@@@", + "@@@STEP_LOG_LINE@python.inline@RETRIES = 5@@@", + "@@@STEP_LOG_LINE@python.inline@TIMEOUT = 60@@@", + "@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 15@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@socket.setdefaulttimeout(TIMEOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@for retry in range(RETRIES):@@@", + "@@@STEP_LOG_LINE@python.inline@ try:@@@", + "@@@STEP_LOG_LINE@python.inline@ with contextlib.closing(@@@", + "@@@STEP_LOG_LINE@python.inline@ urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:@@@", + "@@@STEP_LOG_LINE@python.inline@ hashes = w.read()@@@", + "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[1], 'w') as f:@@@", + "@@@STEP_LOG_LINE@python.inline@ f.write(hashes)@@@", + "@@@STEP_LOG_LINE@python.inline@ break@@@", + "@@@STEP_LOG_LINE@python.inline@ except Exception as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ print 'Failed to get uninteresting hashes from %s:' % HASHES_URL@@@", + "@@@STEP_LOG_LINE@python.inline@ print e@@@", + "@@@STEP_LOG_LINE@python.inline@ if retry == RETRIES:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise@@@", + "@@@STEP_LOG_LINE@python.inline@ waittime = WAIT_BASE * math.pow(2, retry)@@@", + "@@@STEP_LOG_LINE@python.inline@ print 'Retry in %d seconds.' % waittime@@@", + "@@@STEP_LOG_LINE@python.inline@ time.sleep(waittime)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "push", + "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "/storage/emulated/legacy/skiabot/skia_tmp_dir/uninteresting_hashes.txt" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "push uninteresting_hashes.txt" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_run_skia", + "--verbose", + "--logcat", + "-d", + "arm_v7_neon", + "-t", + "Debug", + "dm", + "--undefok", + "--resourcePath", + "/storage/emulated/legacy/skiabot/skia_resources", + "--skps", + "/storage/emulated/legacy/skiabot/skia_skp/skps", + "--images", + "/storage/emulated/legacy/skiabot/skia_images/dm", + "--colorImages", + "/storage/emulated/legacy/skiabot/skia_images/colorspace", + "--nameByHash", + "--properties", + "gitHash", + "abc123", + "master", + "client.skia", + "builder", + "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug", + "build_number", + "6", + "--key", + "arch", + "Arm7", + "compiler", + "GCC", + "configuration", + "Debug", + "cpu_or_gpu", + "GPU", + "cpu_or_gpu_value", + "Tegra3", + "model", + "Nexus7", + "os", + "Android", + "--uninterestingHashesFile", + "/storage/emulated/legacy/skiabot/skia_tmp_dir/uninteresting_hashes.txt", + "--writePath", + "/storage/emulated/legacy/skiabot/skia_dm", + "--nocpu", + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "colorImage", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "_", + "test", + "_", + "GrShape", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "serialize-8888", + "gm", + "_", + "verylargebitmap", + "serialize-8888", + "gm", + "_", + "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "lite-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "_", + "image", + "_", + "interlaced1.png", + "_", + "image", + "_", + "interlaced2.png", + "_", + "image", + "_", + "interlaced3.png", + "_", + "image", + "_", + ".arw", + "_", + "image", + "_", + ".cr2", + "_", + "image", + "_", + ".dng", + "_", + "image", + "_", + ".nef", + "_", + "image", + "_", + ".nrw", + "_", + "image", + "_", + ".orf", + "_", + "image", + "_", + ".raf", + "_", + "image", + "_", + ".rw2", + "_", + "image", + "_", + ".pef", + "_", + "image", + "_", + ".srw", + "_", + "image", + "_", + ".ARW", + "_", + "image", + "_", + ".CR2", + "_", + "image", + "_", + ".DNG", + "_", + "image", + "_", + ".NEF", + "_", + "image", + "_", + ".NRW", + "_", + "image", + "_", + ".ORF", + "_", + "image", + "_", + ".RAF", + "_", + "image", + "_", + ".RW2", + "_", + "image", + "_", + ".PEF", + "_", + "image", + "_", + ".SRW" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "dm" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_pull_if_needed", + "--verbose", + "/storage/emulated/legacy/skiabot/skia_dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "pull skia_dm" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "shell", + "dumpsys", + "batteryproperties" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "final battery stats" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "reboot" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "reboot" + }, + { + "cmd": [ + "sleep", + "10" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "wait for reboot" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "wait for device (3)" + }, + { + "cmd": [ + "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge" + ], + "env": { + "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", + "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_ANDROID_VERBOSE_SETUP": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "wait for charge (3)" + }, + { + "cmd": [ + "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb", + "kill-server" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[SLAVE_BUILD]/out" + }, + "name": "kill-server" + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_test.py b/infra/bots/recipes/swarm_test.py index bf574581ec..c8a8e78969 100644 --- a/infra/bots/recipes/swarm_test.py +++ b/infra/bots/recipes/swarm_test.py @@ -40,6 +40,7 @@ TEST_BUILDERS = { 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug', 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug', 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN', + 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared', 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN', 'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind', 'Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan', @@ -138,6 +139,10 @@ def dm_flags(bot): # Run tests, gms, and image decoding tests everywhere. args.extend('--src tests gm image colorImage'.split(' ')) + # TODO(rmistry): Remove the below once we want to enable SVGs for all bots. + if (bot == 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot' or + bot == 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared'): + args.append('svg') if 'GalaxyS' in bot: args.extend(('--threads', '0')) @@ -435,6 +440,13 @@ def test_steps(api): '--properties' ] + properties + # TODO(rmistry): Remove the below once we want to enable SVGs for all bots. + if (api.vars.builder_name == + 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot' or + api.vars.builder_name == + 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared'): + args.extend(['--svgs', api.flavor.device_dirs.svg_dir]) + args.append('--key') args.extend(key_params(api)) if use_hash_file: @@ -494,7 +506,10 @@ def GenTests(api): api.step_data( 'read SK_IMAGE_VERSION', stdout=api.raw_io.output('42')) + - api.step_data( + api.step_data( + 'read SVG_VERSION', + stdout=api.raw_io.output('42')) + + api.step_data( 'exists skia_dm', stdout=api.raw_io.output('')) ) @@ -531,6 +546,8 @@ def GenTests(api): 'skimage', 'VERSION'), api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), + api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + 'svg', 'VERSION'), api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') ) ) @@ -564,6 +581,8 @@ def GenTests(api): 'skimage', 'VERSION'), api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), + api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + 'svg', 'VERSION'), api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') ) + api.step_data('dm', retcode=1) @@ -585,6 +604,8 @@ def GenTests(api): 'skimage', 'VERSION'), api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), + api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + 'svg', 'VERSION'), api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') ) + AndroidTestData(builder) + @@ -592,6 +613,8 @@ def GenTests(api): stdout=api.raw_io.output('42')) + api.step_data('read SK_IMAGE_VERSION', stdout=api.raw_io.output('42')) + + api.step_data('read SVG_VERSION', + stdout=api.raw_io.output('42')) + api.step_data('get uninteresting hashes', retcode=1) ) @@ -610,6 +633,8 @@ def GenTests(api): 'skimage', 'VERSION'), api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), + api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + 'svg', 'VERSION'), api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') ) + AndroidTestData(builder) + @@ -617,6 +642,8 @@ def GenTests(api): stdout=api.raw_io.output('2')) + api.step_data('read SK_IMAGE_VERSION', stdout=api.raw_io.output('42')) + + api.step_data('read SVG_VERSION', + stdout=api.raw_io.output('42')) + api.step_data( 'exists skps', stdout=api.raw_io.output('')) @@ -637,6 +664,8 @@ def GenTests(api): 'skimage', 'VERSION'), api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), + api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + 'svg', 'VERSION'), api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') ) + AndroidTestData(builder) + @@ -644,6 +673,8 @@ def GenTests(api): retcode=1) + api.step_data('read SK_IMAGE_VERSION', stdout=api.raw_io.output('42')) + + api.step_data('read SVG_VERSION', + stdout=api.raw_io.output('42')) + api.step_data( 'exists skps', stdout=api.raw_io.output('')) @@ -664,6 +695,8 @@ def GenTests(api): 'skimage', 'VERSION'), api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), + api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + 'svg', 'VERSION'), api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') ) + AndroidTestData(builder) + @@ -671,6 +704,8 @@ def GenTests(api): stdout=api.raw_io.output('42')) + api.step_data('read SK_IMAGE_VERSION', stdout=api.raw_io.output('2')) + + api.step_data('read SVG_VERSION', + stdout=api.raw_io.output('42')) + api.step_data( 'exists skia_images', stdout=api.raw_io.output('')) @@ -691,6 +726,8 @@ def GenTests(api): 'skimage', 'VERSION'), api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), + api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + 'svg', 'VERSION'), api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') ) + AndroidTestData(builder) + @@ -698,12 +735,76 @@ def GenTests(api): stdout=api.raw_io.output('42')) + api.step_data('read SK_IMAGE_VERSION', retcode=1) + + api.step_data('read SVG_VERSION', + stdout=api.raw_io.output('42')) + api.step_data( 'exists skia_images', stdout=api.raw_io.output('')) ) yield ( + api.test('download_and_push_svgs') + + api.properties(buildername=builder, + mastername='client.skia', + slavename='skiabot-linux-swarm-000', + buildnumber=6, + revision='abc123', + path_config='kitchen', + swarm_out_dir='[SWARM_OUT_DIR]') + + api.path.exists( + api.path['slave_build'].join('skia'), + api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + 'skimage', 'VERSION'), + api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + 'skp', 'VERSION'), + api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + 'svg', 'VERSION'), + api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') + ) + + AndroidTestData(builder) + + api.step_data('read SKP_VERSION', + stdout=api.raw_io.output('42')) + + api.step_data('read SK_IMAGE_VERSION', + stdout=api.raw_io.output('42')) + + api.step_data('read SVG_VERSION', + stdout=api.raw_io.output('2')) + + api.step_data( + 'exists svgs', + stdout=api.raw_io.output('')) + ) + + yield ( + api.test('missing_SVG_VERSION_device') + + api.properties(buildername=builder, + mastername='client.skia', + slavename='skiabot-linux-swarm-000', + buildnumber=6, + revision='abc123', + path_config='kitchen', + swarm_out_dir='[SWARM_OUT_DIR]') + + api.path.exists( + api.path['slave_build'].join('skia'), + api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + 'skimage', 'VERSION'), + api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + 'skp', 'VERSION'), + api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + 'svg', 'VERSION'), + api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') + ) + + AndroidTestData(builder) + + api.step_data('read SKP_VERSION', + stdout=api.raw_io.output('42')) + + api.step_data('read SK_IMAGE_VERSION', + stdout=api.raw_io.output('42')) + + api.step_data('read SVG_VERSION', + retcode=1) + + api.step_data( + 'exists svgs', + stdout=api.raw_io.output('')) + ) + + yield ( api.test('adb_in_path') + api.properties(buildername=builder, mastername='client.skia', @@ -718,12 +819,16 @@ def GenTests(api): 'skimage', 'VERSION'), api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), + api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + 'svg', 'VERSION'), api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') ) + AndroidTestData(builder, adb='/usr/bin/adb') + api.step_data('read SKP_VERSION', stdout=api.raw_io.output('42')) + api.step_data('read SK_IMAGE_VERSION', + stdout=api.raw_io.output('42')) + + api.step_data('read SVG_VERSION', stdout=api.raw_io.output('42')) ) @@ -746,6 +851,8 @@ def GenTests(api): 'skimage', 'VERSION'), api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), + api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + 'svg', 'VERSION'), api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') ) + api.platform('win', 64) diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json new file mode 100644 index 0000000000..cdf2291ee6 --- /dev/null +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json @@ -0,0 +1,814 @@ +[ + { + "cmd": [ + "python", + "-u", + "\nimport json\nimport sys\n\nwith open(sys.argv[1]) as f:\n content = json.load(f)\n\nprint json.dumps(content, indent=2)\n", + "{\"buildername\": \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}" + ], + "name": "print properties", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import json@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1]) as f:@@@", + "@@@STEP_LOG_LINE@python.inline@ content = json.load(f)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@print json.dumps(content, indent=2)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "git", + "rev-parse", + "HEAD" + ], + "cwd": "[SLAVE_BUILD]/skia", + "name": "git rev-parse", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "python", + "-c", + "\"print 'abc123'\"" + ], + "name": "got_revision", + "~followup_annotations": [ + "@@@SET_BUILD_PROPERTY@got_revision@\"abc123\"@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "", + "[SLAVE_BUILD]/.gclient" + ], + "name": "write .gclient" + }, + { + "cmd": [ + "python", + "-u", + "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" + ], + "cwd": "[SLAVE_BUILD]/skia", + "name": "fix filemodes", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@for r, _, files in os.walk(os.getcwd()):@@@", + "@@@STEP_LOG_LINE@python.inline@ for fname in files:@@@", + "@@@STEP_LOG_LINE@python.inline@ f = os.path.join(r, fname)@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.isfile(f):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.access(f, os.X_OK):@@@", + "@@@STEP_LOG_LINE@python.inline@ os.chmod(f, 0755)@@@", + "@@@STEP_LOG_LINE@python.inline@ else:@@@", + "@@@STEP_LOG_LINE@python.inline@ os.chmod(f, 0644)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", + "--path", + "[SLAVE_BUILD]/swarming.client", + "--url", + "https://chromium.googlesource.com/external/swarming.client.git" + ], + "name": "git setup (swarming_client)" + }, + { + "cmd": [ + "git", + "retry", + "fetch", + "origin", + "master" + ], + "cwd": "[SLAVE_BUILD]/swarming.client", + "env": { + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" + }, + "name": "git fetch (swarming_client)" + }, + { + "cmd": [ + "git", + "checkout", + "-f", + "FETCH_HEAD" + ], + "cwd": "[SLAVE_BUILD]/swarming.client", + "name": "git checkout (swarming_client)" + }, + { + "cmd": [ + "git", + "rev-parse", + "HEAD" + ], + "cwd": "[SLAVE_BUILD]/swarming.client", + "name": "read revision", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@" + ] + }, + { + "cmd": [ + "git", + "clean", + "-f", + "-d", + "-x" + ], + "cwd": "[SLAVE_BUILD]/swarming.client", + "name": "git clean (swarming_client)" + }, + { + "cmd": [ + "git", + "submodule", + "sync" + ], + "cwd": "[SLAVE_BUILD]/swarming.client", + "name": "submodule sync (swarming_client)" + }, + { + "cmd": [ + "git", + "submodule", + "update", + "--init", + "--recursive" + ], + "cwd": "[SLAVE_BUILD]/swarming.client", + "name": "submodule update (swarming_client)" + }, + { + "cmd": [ + "python", + "-u", + "[SLAVE_BUILD]/swarming.client/swarming.py", + "--version" + ], + "name": "swarming.py --version", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_TEXT@0.8.6@@@" + ] + }, + { + "cmd": [ + "download_from_google_storage", + "--no_resume", + "--platform=linux*", + "--no_auth", + "--bucket", + "chromium-luci", + "-d", + "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + ], + "env": { + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" + }, + "name": "download luci-go linux" + }, + { + "cmd": [ + "download_from_google_storage", + "--no_resume", + "--platform=darwin", + "--no_auth", + "--bucket", + "chromium-luci", + "-d", + "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + ], + "env": { + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" + }, + "name": "download luci-go mac" + }, + { + "cmd": [ + "download_from_google_storage", + "--no_resume", + "--platform=win32", + "--no_auth", + "--bucket", + "chromium-luci", + "-d", + "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + ], + "env": { + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" + }, + "name": "download luci-go win" + }, + { + "cmd": [ + "python", + "-u", + "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", + "[SLAVE_BUILD]/luci-go" + ], + "env": { + "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + }, + "name": "rmtree luci-go", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", + "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", + "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", + "[SLAVE_BUILD]/luci-go", + "0" + ], + "name": "Copy Go binary" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", + "--", + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", + "----", + "help" + ], + "name": "gsutil help" + }, + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[SLAVE_BUILD]/swarming_temp_dir", + "511" + ], + "name": "makedirs swarming tmp dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", + "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + ], + "name": "Write compile_skia.isolated.gen.json" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::isolate]/resources/isolate.py", + "[SLAVE_BUILD]/swarming.client", + "batcharchive", + "--dump-json", + "/path/to/tmp/json", + "--isolate-server", + "https://isolateserver.appspot.com", + "--verbose", + "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + ], + "name": "isolate tests", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@json.output@{@@@", + "@@@STEP_LOG_LINE@json.output@ \"compile_skia\": \"[dummy hash for compile_skia]\"@@@", + "@@@STEP_LOG_LINE@json.output@}@@@", + "@@@STEP_LOG_END@json.output@@@", + "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"compile_skia\": \"[dummy hash for compile_skia]\"}@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "[SLAVE_BUILD]/swarming.client/swarming.py", + "trigger", + "--swarming", + "https://chromium-swarm.appspot.com", + "--isolate-server", + "https://isolateserver.appspot.com", + "--priority", + "90", + "--shards", + "1", + "--task-name", + "compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5", + "--dump-json", + "/path/to/tmp/json", + "--expiration", + "72000", + "--io-timeout", + "2400", + "--hard-timeout", + "14400", + "--dimension", + "gpu", + "none", + "--dimension", + "os", + "Ubuntu", + "--dimension", + "pool", + "Skia", + "--tag", + "allow_milo:1", + "--tag", + "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared", + "--tag", + "buildnumber:5", + "--tag", + "data:[dummy hash for compile_skia]", + "--tag", + "master:client.skia", + "--tag", + "name:compile_skia", + "--tag", + "os:Ubuntu", + "--tag", + "revision:abc123", + "--tag", + "slavename:skiabot-linux-swarm-000", + "--tag", + "stepname:compile_skia on Ubuntu", + "--idempotent", + "[dummy hash for compile_skia]", + "--", + "--workdir", + "../../..", + "swarm_compile", + "buildername=Build-Ubuntu-GCC-x86_64-Release-Shared", + "mastername=client.skia.compile", + "buildnumber=1", + "slavename=skiabot-dummy-compile-slave", + "reason=Triggered by Skia swarm_trigger Recipe", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=abc123" + ], + "name": "[trigger] compile_skia on Ubuntu", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@json.output@{@@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", + "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@}@@@", + "@@@STEP_LOG_END@json.output@@@", + "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@", + "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/10000@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "[SLAVE_BUILD]/swarming.client/swarming.py", + "collect", + "--swarming", + "https://chromium-swarm.appspot.com", + "--decorate", + "--print-status-updates", + "--json", + "{\"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5\", \"tasks\": {\"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "--task-summary-json", + "/path/to/tmp/json" + ], + "name": "compile_skia on Ubuntu", + "~followup_annotations": [ + "@@@STEP_TEXT@swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{@@@", + "@@@STEP_LOG_LINE@json.output@ \"shards\": [@@@", + "@@@STEP_LOG_LINE@json.output@ {@@@", + "@@@STEP_LOG_LINE@json.output@ \"abandoned_ts\": null, @@@", + "@@@STEP_LOG_LINE@json.output@ \"bot_id\": \"vm30\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"completed_ts\": \"2014-09-25T01:42:00.123\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"created_ts\": \"2014-09-25T01:41:00.123\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"durations\": [@@@", + "@@@STEP_LOG_LINE@json.output@ 5.7, @@@", + "@@@STEP_LOG_LINE@json.output@ 31.5@@@", + "@@@STEP_LOG_LINE@json.output@ ], @@@", + "@@@STEP_LOG_LINE@json.output@ \"exit_codes\": [@@@", + "@@@STEP_LOG_LINE@json.output@ 0, @@@", + "@@@STEP_LOG_LINE@json.output@ 0@@@", + "@@@STEP_LOG_LINE@json.output@ ], @@@", + "@@@STEP_LOG_LINE@json.output@ \"failure\": false, @@@", + "@@@STEP_LOG_LINE@json.output@ \"id\": \"148aa78d7aa0000\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"internal_failure\": false, @@@", + "@@@STEP_LOG_LINE@json.output@ \"isolated_out\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"isolated\": \"abc123\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"isolatedserver\": \"https://isolateserver.appspot.com\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"namespace\": \"default-gzip\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"blah\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"modified_ts\": \"2014-09-25 01:42:00\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"name\": \"heartbeat-canary-2014-09-25_01:41:55-os=Windows\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"outputs\": [@@@", + "@@@STEP_LOG_LINE@json.output@ \"Heart beat succeeded on win32.\\n\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"Foo\"@@@", + "@@@STEP_LOG_LINE@json.output@ ], @@@", + "@@@STEP_LOG_LINE@json.output@ \"started_ts\": \"2014-09-25T01:42:11.123\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"state\": 112, @@@", + "@@@STEP_LOG_LINE@json.output@ \"try_number\": 1, @@@", + "@@@STEP_LOG_LINE@json.output@ \"user\": \"unknown\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ ]@@@", + "@@@STEP_LOG_LINE@json.output@}@@@", + "@@@STEP_LOG_END@json.output@@@", + "@@@STEP_LINK@shard #0 isolated out@blah@@@", + "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/148aa78d7aa0000@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "/path/to/tmp/" + ], + "name": "read 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": "read skimage VERSION" + }, + { + "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": "read svg VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[SLAVE_BUILD]/swarming_temp_dir", + "511" + ], + "name": "makedirs swarming tmp dir (2)", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", + "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + ], + "name": "Write test_skia.isolated.gen.json" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::isolate]/resources/isolate.py", + "[SLAVE_BUILD]/swarming.client", + "batcharchive", + "--dump-json", + "/path/to/tmp/json", + "--isolate-server", + "https://isolateserver.appspot.com", + "--verbose", + "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + ], + "name": "isolate tests (2)", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@json.output@{@@@", + "@@@STEP_LOG_LINE@json.output@ \"test_skia\": \"[dummy hash for test_skia]\"@@@", + "@@@STEP_LOG_LINE@json.output@}@@@", + "@@@STEP_LOG_END@json.output@@@", + "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test_skia\": \"[dummy hash for test_skia]\"}@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", + "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated", + "abc123" + ], + "name": "add_isolated_input", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import json@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1]) as f:@@@", + "@@@STEP_LOG_LINE@python.inline@ isolated = json.load(f)@@@", + "@@@STEP_LOG_LINE@python.inline@if not isolated.get('includes'):@@@", + "@@@STEP_LOG_LINE@python.inline@ isolated['includes'] = []@@@", + "@@@STEP_LOG_LINE@python.inline@for h in sys.argv[2:]:@@@", + "@@@STEP_LOG_LINE@python.inline@ isolated['includes'].append(h)@@@", + "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1], 'w') as f:@@@", + "@@@STEP_LOG_LINE@python.inline@ json.dump(isolated, f, sort_keys=True)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "archive", + "--isolate-server", + "https://isolateserver.appspot.com", + "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated" + ], + "name": "upload new .isolated file for test_skia", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "python", + "-u", + "[SLAVE_BUILD]/swarming.client/swarming.py", + "trigger", + "--swarming", + "https://chromium-swarm.appspot.com", + "--isolate-server", + "https://isolateserver.appspot.com", + "--priority", + "90", + "--shards", + "1", + "--task-name", + "test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5", + "--dump-json", + "/path/to/tmp/json", + "--expiration", + "72000", + "--io-timeout", + "2400", + "--hard-timeout", + "14400", + "--dimension", + "cpu", + "x86-64-avx2", + "--dimension", + "gpu", + "none", + "--dimension", + "os", + "Ubuntu", + "--dimension", + "pool", + "Skia", + "--tag", + "allow_milo:1", + "--tag", + "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared", + "--tag", + "buildnumber:5", + "--tag", + "data:def456", + "--tag", + "master:client.skia", + "--tag", + "name:test_skia", + "--tag", + "os:Ubuntu", + "--tag", + "revision:abc123", + "--tag", + "slavename:skiabot-linux-swarm-000", + "--tag", + "stepname:test_skia on Ubuntu", + "--cipd-package", + "skp:skia/bots/skp:version:0", + "--cipd-package", + "skimage:skia/bots/skimage:version:0", + "--cipd-package", + "svg:skia/bots/svg:version:0", + "def456", + "--", + "--workdir", + "../../..", + "swarm_test", + "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared", + "mastername=client.skia", + "buildnumber=5", + "slavename=skiabot-linux-swarm-000", + "reason=Triggered by Skia swarm_trigger Recipe", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=abc123" + ], + "name": "[trigger] test_skia on Ubuntu", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@json.output@{@@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", + "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@}@@@", + "@@@STEP_LOG_END@json.output@@@", + "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@", + "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/10000@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", + "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia" + ], + "env": { + "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + }, + "name": "rmtree test_skia", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", + "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", + "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "[SLAVE_BUILD]/swarming.client/swarming.py", + "collect", + "--swarming", + "https://chromium-swarm.appspot.com", + "--decorate", + "--print-status-updates", + "--json", + "{\"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5\", \"tasks\": {\"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "--task-summary-json", + "/path/to/tmp/json", + "--task-output-dir", + "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia" + ], + "name": "test_skia on Ubuntu", + "~followup_annotations": [ + "@@@STEP_TEXT@swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{@@@", + "@@@STEP_LOG_LINE@json.output@ \"shards\": [@@@", + "@@@STEP_LOG_LINE@json.output@ {@@@", + "@@@STEP_LOG_LINE@json.output@ \"abandoned_ts\": null, @@@", + "@@@STEP_LOG_LINE@json.output@ \"bot_id\": \"vm30\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"completed_ts\": \"2014-09-25T01:42:00.123\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"created_ts\": \"2014-09-25T01:41:00.123\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"durations\": [@@@", + "@@@STEP_LOG_LINE@json.output@ 5.7, @@@", + "@@@STEP_LOG_LINE@json.output@ 31.5@@@", + "@@@STEP_LOG_LINE@json.output@ ], @@@", + "@@@STEP_LOG_LINE@json.output@ \"exit_codes\": [@@@", + "@@@STEP_LOG_LINE@json.output@ 0, @@@", + "@@@STEP_LOG_LINE@json.output@ 0@@@", + "@@@STEP_LOG_LINE@json.output@ ], @@@", + "@@@STEP_LOG_LINE@json.output@ \"failure\": false, @@@", + "@@@STEP_LOG_LINE@json.output@ \"id\": \"148aa78d7aa0000\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"internal_failure\": false, @@@", + "@@@STEP_LOG_LINE@json.output@ \"isolated_out\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"isolated\": \"abc123\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"isolatedserver\": \"https://isolateserver.appspot.com\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"namespace\": \"default-gzip\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"blah\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"modified_ts\": \"2014-09-25 01:42:00\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"name\": \"heartbeat-canary-2014-09-25_01:41:55-os=Windows\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"outputs\": [@@@", + "@@@STEP_LOG_LINE@json.output@ \"Heart beat succeeded on win32.\\n\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"Foo\"@@@", + "@@@STEP_LOG_LINE@json.output@ ], @@@", + "@@@STEP_LOG_LINE@json.output@ \"started_ts\": \"2014-09-25T01:42:11.123\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"state\": 112, @@@", + "@@@STEP_LOG_LINE@json.output@ \"try_number\": 1, @@@", + "@@@STEP_LOG_LINE@json.output@ \"user\": \"unknown\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ ]@@@", + "@@@STEP_LOG_LINE@json.output@}@@@", + "@@@STEP_LOG_END@json.output@@@", + "@@@STEP_LINK@shard #0 isolated out@blah@@@", + "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/148aa78d7aa0000@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", + "[SLAVE_BUILD]/dm" + ], + "env": { + "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + }, + "name": "rmtree dm", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", + "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", + "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/dm", + "[SLAVE_BUILD]/dm", + "0" + ], + "name": "dm_dir" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[skia::core]/resources/upload_dm_results.py", + "[SLAVE_BUILD]/dm", + "abc123", + "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared", + "5", + "", + "[SLAVE_BUILD]/skia/common/py/utils" + ], + "cwd": "[SLAVE_BUILD]/skia", + "env": { + "AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto", + "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto" + }, + "name": "Upload DM Results" + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_trigger.py b/infra/bots/recipes/swarm_trigger.py index 17d2d697ec..2948b5dbf5 100644 --- a/infra/bots/recipes/swarm_trigger.py +++ b/infra/bots/recipes/swarm_trigger.py @@ -55,6 +55,7 @@ TEST_BUILDERS = { 'Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release', 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug', 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN', + 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared', 'Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release', 'Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release', ], @@ -679,9 +680,15 @@ def RunSteps(api): if not (do_test_steps or do_perf_steps): return - # SKPs, SkImages. + # SKPs, SkImages, SVGs. cipd_packages.append(cipd_pkg(api, infrabots_dir, 'skp')) cipd_packages.append(cipd_pkg(api, infrabots_dir, 'skimage')) + # TODO(rmistry): Remove the below once we want to enable SVGs for all bots. + if (api.properties['buildername'] == + 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot' or + api.properties['buildername'] == + 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared'): + cipd_packages.append(cipd_pkg(api, infrabots_dir, 'svg')) # Trigger test and perf tasks. test_task = None @@ -749,6 +756,8 @@ def test_for_bot(api, builder, mastername, slavename, testname=None): 'skia', 'infra', 'bots', 'assets', 'skimage', 'VERSION')) paths.append(api.path['slave_build'].join( 'skia', 'infra', 'bots', 'assets', 'skp', 'VERSION')) + paths.append(api.path['slave_build'].join( + 'skia', 'infra', 'bots', 'assets', 'svg', 'VERSION')) test += api.path.exists(*paths) |