commit cfff58a85dadb192486386976c90eba660933565
author Prathmesh Prabhu <pprabhu@chromium.org> Mon Feb 06 10:07:43 2017 -0800
committer chrome-bot <chrome-bot@chromium.org> Thu Feb 09 12:47:39 2017 -0800
tree 4ffc6188f0bd9ff40a40346747f7705e20c9a1a8
parent cc75229b585814f55c645b48c93bfc1e67d86812

telemetry: Remove dependence on afe_utils

BUG=chromium:678430
TEST=Run a telemetry test locally.

Change-Id: Ic321abab4648d90f1ad2ce1981aab9b29510eedc
Reviewed-on: https://chromium-review.googlesource.com/438712
Commit-Ready: Prathmesh Prabhu <pprabhu@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Xixuan Wu <xixuan@chromium.org>
Reviewed-by: Dan Shi <dshi@google.com>

server/cros/telemetry_runner.py

diff --git a/server/cros/telemetry_runner.py b/server/cros/telemetry_runner.py
index 08bc6a5..6586993 100644
--- a/server/cros/telemetry_runner.py
+++ b/server/cros/telemetry_runner.py
@@ -8,7 +8,6 @@
 
 from autotest_lib.client.common_lib import error, utils
 from autotest_lib.client.common_lib.cros import dev_server
-from autotest_lib.server import afe_utils
 
 
 TELEMETRY_RUN_BENCHMARKS_SCRIPT = 'tools/perf/run_benchmark'
@@ -150,20 +149,19 @@
         """Setup Telemetry to use the devserver."""
         logging.debug('Setting up telemetry for devserver testing')
         logging.debug('Grabbing build from AFE.')
-
-        build = afe_utils.get_build(self._host)
-        if not build:
+        info = self._host.host_info_store.get()
+        if not info.build:
             logging.error('Unable to locate build label for host: %s.',
                           self._host.hostname)
             raise error.AutotestError('Failed to grab build for host %s.' %
                                       self._host.hostname)
 
-        logging.debug('Setting up telemetry for build: %s', build)
+        logging.debug('Setting up telemetry for build: %s', info.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)
+        self._devserver = dev_server.ImageServer.resolve(
+                info.build, hostname=self._host.hostname)
+        self._devserver.stage_artifacts(info.build, ['autotest_packages'])
+        self._telemetry_path = self._devserver.setup_telemetry(build=info.build)
 
 
     def _setup_local_telemetry(self):