commit e427e21ac464fd1be7bd938b4b7b325764f2cbe0
author Amin Hassani <ahassani@chromium.org> Mon Oct 28 11:04:27 2019 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Nov 19 06:06:51 2019 +0000
tree 5e75488044e657e29b03eac015c010dd42ff48ec
parent c5af426f058c81ab731ad74d4de5efa275bb0194

cros_update: Migrate to chromite

This is mostly uses the cros_update files in the chromite.

BUG=chromium:1003986
TEST=./devserver_integration_test.py

Cq-Depend: chromium:1866027
Change-Id: Id9c3f6e4c6b8e08889ec96942f37f3e084380e9a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/1894676
Tested-by: Amin Hassani <ahassani@chromium.org>
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

devserver.py

diff --git a/devserver.py b/devserver.py
index 3b89260..8478a44 100755
--- a/devserver.py
+++ b/devserver.py
@@ -49,14 +49,13 @@
 
 import autoupdate
 import cherrypy_ext
-import cros_update
-import cros_update_progress
 import health_checker
 
 # This must happen before any local modules get a chance to import
 # anything from chromite.  Otherwise, really bad things will happen, and
 # you will _not_ understand why.
 import setup_chromite  # pylint: disable=unused-import
+from chromite.lib import cros_update_progress
 from chromite.lib.xbuddy import android_build
 from chromite.lib.xbuddy import artifact_info
 from chromite.lib.xbuddy import build_artifact
@@ -65,7 +64,7 @@
 from chromite.lib.xbuddy import devserver_constants
 from chromite.lib.xbuddy import downloader
 from chromite.lib.xbuddy import xbuddy
-
+from chromite.scripts import cros_update
 
 # Module-local log function.
 def _Log(message, *args):
@@ -779,10 +778,8 @@
 
     if is_async:
       # Command of running auto-update.
-      path = os.path.dirname(os.path.abspath(__file__))
-      execute_file = os.path.join(path, 'cros_update.py')
-      cmd = ['/usr/bin/python', '-u', execute_file, '-d', host_name,
-             '-b', build_name, '--static_dir', updater.static_dir]
+      cmd = ['cros_update', '--hostname', host_name, '-b', build_name,
+             '--static_dir', updater.static_dir]
 
       # The original_build's format is like: link/3428.210.0
       # The corresponding release_archive_url's format is like: