commit 8672346ad7cea4606a723db794bb09ce50d578d2
author Ben Pastene <bpastene@chromium.org> Thu Apr 26 11:07:27 2018 -0700
committer chrome-bot <chrome-bot@chromium.org> Thu May 03 21:27:52 2018 -0700
tree f2ad7cbfeef589be7f50038612ff84890602f2db
parent 8570f95853a5080e124e63986efa3272caf2634b

Add the chromeos/OWNERS file to the ChromeLKGM committer's checkout.

This will prevent the updater from failing when there's no active
gardener (eg: CL:1023000)

When that's the case, it'll fallback to the --tbr-owners mechanism, which needs
an OWNERS file available to select an OWNER to TBR.

BUG=None
TEST=Unittests

Change-Id: If859d28fbc69b2dbb84d0fe5a8539a438597d120
Reviewed-on: https://chromium-review.googlesource.com/1029457
Commit-Ready: Ben Pastene <bpastene@chromium.org>
Tested-by: Ben Pastene <bpastene@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>

lib/constants.py

diff --git a/lib/constants.py b/lib/constants.py
index d536a4c..38a2551 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -1014,6 +1014,8 @@
 # Paths for Chrome LKGM which are relative to the Chromium base url.
 CHROME_LKGM_FILE = 'CHROMEOS_LKGM'
 PATH_TO_CHROME_LKGM = 'chromeos/%s' % CHROME_LKGM_FILE
+# Path for the Chrome LKGM's closest OWNERS file.
+PATH_TO_CHROME_CHROMEOS_OWNERS = 'chromeos/OWNERS'
 
 # Cache constants.
 COMMON_CACHE = 'common'

scripts/chrome_chromeos_lkgm.py

diff --git a/scripts/chrome_chromeos_lkgm.py b/scripts/chrome_chromeos_lkgm.py
index 7ea4989..2b1fd00 100644
--- a/scripts/chrome_chromeos_lkgm.py
+++ b/scripts/chrome_chromeos_lkgm.py
@@ -31,6 +31,13 @@
 
   _COMMIT_MSG_TEMPLATE = ('LKGM %(version)s for chromeos.'
                           '\n\nBUG=762641')
+  # Files needed in a local checkout to successfully update the LKGM. The OWNERS
+  # file allows the --tbr-owners mechanism to select an appropriate OWNER to
+  # TBR.
+  _NEEDED_FILES = [
+      constants.PATH_TO_CHROME_CHROMEOS_OWNERS,
+      constants.PATH_TO_CHROME_LKGM,
+  ]
 
   def __init__(self, args):
     self._committer = chrome_committer.ChromeCommitter(args)
@@ -46,14 +53,14 @@
 
   def Run(self):
     self._committer.Cleanup()
-    self._committer.Checkout([constants.PATH_TO_CHROME_LKGM])
+    self._committer.Checkout(self._NEEDED_FILES)
     self.UpdateLKGM()
     self.CommitNewLKGM()
     self._committer.Upload()
 
   def CheckoutChrome(self):
     """Checks out chrome into tmp checkout_dir."""
-    self._committer.Checkout([constants.PATH_TO_CHROME_LKGM])
+    self._committer.Checkout(self._NEEDED_FILES)
 
   @property
   def lkgm_file(self):