commit 75a49444fea859d424e56943f42ce2028a737af1
author Ting-Yuan Huang <laszio@chromium.org> Mon Aug 22 17:11:07 2016 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Wed Aug 24 20:31:12 2016 +0000
tree 1d2f3ec457fd1ee10f7dee9489e3afc98c7faf45
parent 8423e6540691b8156e035bb7269ab1a52a53c758

telemetry_runner: prefer devserver in the same subnet with dut

dev_server.ImageServer.resolve can sometimes return a devserver
far away from the dut and introduce problems.

BUG=chromium:639502
TEST=none; not test-able locally.

Change-Id: Ie2330d3e588b35baf68adadd86e71f9202463eca
Reviewed-on: https://chromium-review.googlesource.com/374138
Commit-Ready: Luis Lozano <llozano@chromium.org>
Tested-by: Ting-Yuan Huang <laszio@chromium.org>
Tested-by: Luis Lozano <llozano@chromium.org>
Reviewed-by: Xixuan Wu <xixuan@chromium.org>
Reviewed-by: Luis Lozano <llozano@chromium.org>
(cherry picked from commit 5d459a2dd31ce2b78aedf23e55d6bc946fe72bf8)
Reviewed-on: https://chromium-review.googlesource.com/375061
Commit-Queue: Ting-Yuan Huang <laszio@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>

server/cros/telemetry_runner.py

diff --git a/server/cros/telemetry_runner.py b/server/cros/telemetry_runner.py
index 09f57d7..8bfbf7f 100644
--- a/server/cros/telemetry_runner.py
+++ b/server/cros/telemetry_runner.py
@@ -157,7 +157,8 @@
 
         logging.debug('Setting up telemetry for build: %s', build)
 
-        self._devserver = dev_server.ImageServer.resolve(build)
+        self._devserver = dev_server.ImageServer.resolve(build,
+                hostname=self._host.hostname)
         self._devserver.stage_artifacts(build, ['autotest_packages'])
         self._telemetry_path = self._devserver.setup_telemetry(build=build)