commit c2615b7727cb06aff20017c9d8567cff06e95cf4
author Michael Mortensen <mmortensen@google.com> Tue Oct 15 08:12:24 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Wed Oct 16 03:02:01 2019 +0000
tree 920fe622472b485a7054709fdeaa06a10bba84f0
parent ac6afeb999e9691fb643819671c4e68d04375883

Add determine_chrome_version to GetTargetVersions.

BUG=chromium:1004438
TEST=manual, run_tests

Change-Id: Ib17d960eafa7ded2c8c13064d804d348c29b7b93
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1862646
Tested-by: Michael Mortensen <mmortensen@google.com>
Reviewed-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Michael Mortensen <mmortensen@google.com>

api/controller/packages.py

diff --git a/api/controller/packages.py b/api/controller/packages.py
index a2e8638..0afec19 100644
--- a/api/controller/packages.py
+++ b/api/controller/packages.py
@@ -105,11 +105,7 @@
 def GetChromeVersion(input_proto, output_proto, _config):
   """Returns the chrome version."""
   build_target = controller_util.ParseBuildTarget(input_proto.build_target)
-  cpv = packages.get_best_visible(
-      constants.CHROME_CP, build_target=build_target)
-
-  # Something like 1.2.3.4_rc -> 1.2.3.4.
-  output_proto.version = cpv.version_no_rev.split('_')[0]
+  output_proto.version = packages.determine_chrome_version(build_target)
 
 
 def _HasChromePrebuiltSuccess(_input_proto, output_proto, _config):
@@ -129,6 +125,7 @@
       build_target)
   output_proto.android_target_version = packages.determine_android_target(
       build_target)
+  output_proto.chrome_version = packages.determine_chrome_version(build_target)
   # TODO(crbug.com/1004438): Implement remaining version fields.