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>
This commit is contained in:
parent
eb70238dd5
commit
bc54533b2b
@ -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",
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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",
|
||||
|
@ -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",
|
||||
|
@ -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",
|
||||
|
@ -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",
|
||||
|
Loading…
Reference in New Issue
Block a user