diff options
| author |  Kevin Lubick <kjlubick@google.com> | 2018-04-19 09:29:20 -0400 |
|---|---|---|
| committer |  Eric Boren <borenet@google.com> | 2018-04-19 14:39:56 +0000 |
| commit | bc54533b2b2c6dddd182806a0dc0dd012e7139e2 (patch) | |
| tree | e4cbd682ea9eebd946424c3d47bbafcbd27ecd58 | |
| parent | eb70238dd51fbcb89b52f6cd1690c7477550ddf6 (diff) | |
Fix Chromecast bots
The psuedo-tty allocation seems to have been wrong and switching
to Kitchen exacerbated the matter.
Bug: skia:
Change-Id: Ie44d3952383d89d398722837e7bbc51798e5833e
Reviewed-on: https://skia-review.googlesource.com/122304
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Auto-Submit: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
6 files changed, 17 insertions, 21 deletions
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 24d0b74c80..a179566f59 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 @@ -745,8 +745,7 @@ "ssh", "-oConnectTimeout=15", "-oBatchMode=yes", - "-t", - "-t", + "-T", "root@192.168.1.2", "/cache/skia/bin/nanobench", "--some-flag" @@ -781,8 +780,7 @@ "ssh", "-oConnectTimeout=15", "-oBatchMode=yes", - "-t", - "-t", + "-T", "root@192.168.1.2", "rm", "-r", diff --git a/infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py b/infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py index d1b8f22030..987359243b 100644 --- a/infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py @@ -191,8 +191,14 @@ class GNChromecastFlavorUtils(gn_android_flavor.GNAndroidFlavorUtils): self._adb('kill adb server', 'kill-server') def _ssh(self, title, *cmd, **kwargs): + # Don't use -t -t (Force psuedo-tty allocation) like in the ChromeOS + # version because the pseudo-tty allocation seems to fail + # instantly when talking to a Chromecast. + # This was excacerbated when we migrated to kitchen and was marked by + # the symptoms of all the ssh commands instantly failing (even after + # connecting and authenticating) with exit code -1 (255) ssh_cmd = ['ssh', '-oConnectTimeout=15', '-oBatchMode=yes', - '-t', '-t', 'root@%s' % self.user_ip] + list(cmd) + '-T', 'root@%s' % self.user_ip] + list(cmd) return self.m.run(self.m.step, title, cmd=ssh_cmd, **kwargs) diff --git a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All.json b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All.json index b21620d654..3b25400d2a 100644 --- a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All.json @@ -317,8 +317,7 @@ "ssh", "-oConnectTimeout=15", "-oBatchMode=yes", - "-t", - "-t", + "-T", "root@192.168.1.2", "/cache/skia/bin/nanobench", "--nogpu", @@ -354,8 +353,7 @@ "ssh", "-oConnectTimeout=15", "-oBatchMode=yes", - "-t", - "-t", + "-T", "root@192.168.1.2", "rm", "-r", diff --git a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json index a5465fb680..53a3e3dd10 100644 --- a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json @@ -353,8 +353,7 @@ "ssh", "-oConnectTimeout=15", "-oBatchMode=yes", - "-t", - "-t", + "-T", "root@192.168.1.2", "/cache/skia/bin/nanobench", "--nocpu", @@ -444,8 +443,7 @@ "ssh", "-oConnectTimeout=15", "-oBatchMode=yes", - "-t", - "-t", + "-T", "root@192.168.1.2", "rm", "-r", diff --git a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json index 175b294b2f..5d0b0c0f2e 100644 --- a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json @@ -462,8 +462,7 @@ "ssh", "-oConnectTimeout=15", "-oBatchMode=yes", - "-t", - "-t", + "-T", "root@192.168.1.2", "/cache/skia/bin/dm", "--resourcePath", @@ -564,8 +563,7 @@ "ssh", "-oConnectTimeout=15", "-oBatchMode=yes", - "-t", - "-t", + "-T", "root@192.168.1.2", "rm", "-r", diff --git a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json index 376277abdf..aa9d9686eb 100644 --- a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json @@ -462,8 +462,7 @@ "ssh", "-oConnectTimeout=15", "-oBatchMode=yes", - "-t", - "-t", + "-T", "root@192.168.1.2", "/cache/skia/bin/dm", "--resourcePath", @@ -671,8 +670,7 @@ "ssh", "-oConnectTimeout=15", "-oBatchMode=yes", - "-t", - "-t", + "-T", "root@192.168.1.2", "rm", "-r", |