commit 4f9927e72bfd14acd14408c1b35173fdd2b1064f
author Matthew Sartori <msartori@google.com> Fri Sep 25 11:43:11 2015 -0700
committer Matthew Sartori <msartori@chromium.org> Thu Oct 01 18:22:44 2015 +0000
tree f9150960df2548201dbf3c57ddfeac9c89041f56
parent edd6634acf24ed26a4acdaad6af46912fe4135bf

paygen: Fix for generating NMO deltas.

Paygen maintains channel names as 'X-channel' where
X is dev, canary, etc. Goldeneye does not maintain
the channel ending.

This CL changes NMO build discovery so that we check
for the correct channel name as presented by Goldeneye.

BUG=chromium:525271
TEST=Unittests.

Reviewed-on: https://chromium-review.googlesource.com/302582
Commit-Ready: Matthew Sartori <msartori@chromium.org>
Tested-by: Matthew Sartori <msartori@chromium.org>
Reviewed-by: Matthew Sartori <msartori@chromium.org>

(cherry picked from commit f35deb0499c907b70070bb0df5f595c75863f6a8)

Change-Id: If31d9d3b7ccf434895a4317fcdb96639dceb70a6
Reviewed-on: https://chromium-review.googlesource.com/303484
Tested-by: Matthew Sartori <msartori@chromium.org>
Reviewed-by: Dharani Govindan <dharani@chromium.org>

lib/paygen/paygen_build_lib.py

diff --git a/lib/paygen/paygen_build_lib.py b/lib/paygen/paygen_build_lib.py
index a248bd9..6d768e5 100644
--- a/lib/paygen/paygen_build_lib.py
+++ b/lib/paygen/paygen_build_lib.py
@@ -610,13 +610,17 @@
     """
     results = []
 
+    # Paygen channel names typically end in '-channel', while Goldeneye
+    # does not maintain the '-channel' ending.
+    channel_name = self._build.channel.replace('-channel', '')
+
     contents = json.loads(gslib.Cat(OMAHA_URI))
     for nmo in contents.get('omaha_data', []):
       nmo_board = nmo['board']['public_codename']
       nmo_channel = nmo['channel']
       nmo_version = nmo['chrome_os_version']
 
-      if nmo_board == self._build.board and nmo_channel == self._build.channel:
+      if nmo_board == self._build.board and nmo_channel == channel_name:
         results.append(gspaths.Build(gspaths.Build(version=nmo_version,
                                                    board=self._build.board,
                                                    channel=self._build.channel,

lib/paygen/paygen_build_lib_unittest.py

diff --git a/lib/paygen/paygen_build_lib_unittest.py b/lib/paygen/paygen_build_lib_unittest.py
index 106e48a..6498629 100644
--- a/lib/paygen/paygen_build_lib_unittest.py
+++ b/lib/paygen/paygen_build_lib_unittest.py
@@ -400,7 +400,7 @@
            u'keyset': u'foo-mp',
            u'board':
            {u'public_codename': u'foo-board', u'is_active': True},
-           u'chrome_os_version': u'7478.0.0', u'channel': u'foo-channel',
+           u'chrome_os_version': u'7478.0.0', u'channel': u'foo',
            u'payloads':
            [{u'max_fraction': False,
              u'name': u'foo-channel/foo/7478.0.0/payloads/'
@@ -421,7 +421,7 @@
            u'keyset': u'notfoo-mp',
            u'board':
            {u'public_codename': u'notfoo-board', u'is_active': True},
-           u'chrome_os_version': u'7478.0.0', u'channel': u'notfoo-channel',
+           u'chrome_os_version': u'7478.0.0', u'channel': u'notfoo',
            u'payloads':
            [{u'max_fraction': False,
              u'name': u'notfoo-channel/notfoo/7478.0.0/payloads/'