From 608c35ae108c7bdc2cd71612ad8aa58b24c10b16 Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Tue, 16 Jan 2018 16:15:57 -0500 Subject: Fix Test-Chromecast from running out of memory on tests Bug: skia:7166 Change-Id: Iefc8c6c1b72805dfe3ec8bd06d6ba6a878307582 Reviewed-on: https://skia-review.googlesource.com/93620 Commit-Queue: Kevin Lubick Reviewed-by: Mike Klein --- ...st-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json | 20 -------------------- .../recipe_modules/flavor/gn_chromecast_flavor.py | 19 ++++++++++++++----- 2 files changed, 14 insertions(+), 25 deletions(-) (limited to 'infra/bots/recipe_modules') diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json index fa51d74d82..f141a1bf2d 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json @@ -206,26 +206,6 @@ "infra_step": true, "name": "mkdir /cache/skia/bin" }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "root@192.168.1.2", - "rm", - "/cache/skia/nanobench" - ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" - }, - "infra_step": true, - "name": "Delete old nanobench" - }, { "cmd": [ "python", diff --git a/infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py b/infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py index 771bc8e45b..11ee674ab2 100644 --- a/infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py @@ -18,6 +18,20 @@ class GNChromecastFlavorUtils(gn_android_flavor.GNAndroidFlavorUtils): self.m.vars.android_bin_dir = self.m.path.join(self.m.vars.android_bin_dir, 'bin') + # Disk space is extremely tight on the Chromecasts (~100M) There is not + # enough space on the android_data_dir (/cache/skia) to fit the images, + # resources, executable and output the dm images. So, we have dm_out be + # on the tempfs (i.e. RAM) /dev/shm. (which is about 140M) + + self.device_dirs = default_flavor.DeviceDirs( + dm_dir = '/dev/shm/skia/dm_out', + perf_data_dir = self.m.vars.android_data_dir + 'perf', + resource_dir = self.m.vars.android_data_dir + 'resources', + images_dir = self.m.vars.android_data_dir + 'images', + skp_dir = self.m.vars.android_data_dir + 'skps', + svg_dir = self.m.vars.android_data_dir + 'svgs', + tmp_dir = self.m.vars.android_data_dir) + @property def user_ip_host(self): if not self._user_ip: @@ -97,11 +111,6 @@ class GNChromecastFlavorUtils(gn_android_flavor.GNAndroidFlavorUtils): super(GNChromecastFlavorUtils, self).install() self._adb('mkdir ' + self.m.vars.android_bin_dir, 'shell', 'mkdir', '-p', self.m.vars.android_bin_dir) - # TODO(kjlubick): Remove this after we are backfilled up and don't need - # to manually delete this - self._ssh('Delete old nanobench', 'rm', '/cache/skia/nanobench', - abort_on_failure=False, fail_build_on_failure=False, - infra_step=True) def _adb(self, title, *cmd, **kwargs): if not self._ever_ran_adb: -- cgit v1.2.3