summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@chromium.org>2021-02-17 13:51:08 -0500
committerCommit Bot <commit-bot@chromium.org>2021-02-17 20:49:50 +0000
commit9fb7bcda517d80c2ca7b73874615fa0f5db2fa7a (patch)
tree325a58bd014866485c1ae6660574083c08b5f203
parent322c5127caaa0087444e81f150f936b106c245c3 (diff)
downloadchromite-9fb7bcda517d80c2ca7b73874615fa0f5db2fa7a.tar.gz
chrome sdk: use HEAD to look up CrOS LKGM
When chromium/src switches branches, this will let us stay in sync automatically without requiring a change. BUG=chromium:1126855 TEST=CQ passes Change-Id: Ic67f70d5d7dea393fdf2296152939fcad8e70e85 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2698934 Reviewed-by: Ben Pastene <bpastene@chromium.org> Reviewed-by: Achuith Bhandarkar <achuith@chromium.org> Commit-Queue: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org>
-rw-r--r--cbuildbot/commands.py2
-rw-r--r--cbuildbot/commands_unittest.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/cbuildbot/commands.py b/cbuildbot/commands.py
index d590f0800..7882b2d04 100644
--- a/cbuildbot/commands.py
+++ b/cbuildbot/commands.py
@@ -3507,7 +3507,7 @@ def GeneratePayloads(target_image_path,
def GetChromeLKGM(revision):
"""Returns the ChromeOS LKGM from Chrome given the git revision."""
- revision = revision or 'refs/heads/master'
+ revision = revision or 'HEAD'
lkgm_url_path = '%s/+/%s/%s?format=text' % (
constants.CHROMIUM_SRC_PROJECT, revision, constants.PATH_TO_CHROME_LKGM)
contents_b64 = gob_util.FetchUrl(config_lib.GetSiteParams().EXTERNAL_GOB_HOST,
diff --git a/cbuildbot/commands_unittest.py b/cbuildbot/commands_unittest.py
index 8e36cff3a..1dc524fdd 100644
--- a/cbuildbot/commands_unittest.py
+++ b/cbuildbot/commands_unittest.py
@@ -1199,7 +1199,7 @@ fe5d699f2e9e4a7de031497953313dbd *./models/snappy/setvars.sh
chrome_lkgm = b'3322.0.0'
url = '%s/+/%s/%s?format=text' % (
constants.CHROMIUM_SRC_PROJECT,
- chrome_revision or 'refs/heads/master',
+ chrome_revision or 'HEAD',
constants.PATH_TO_CHROME_LKGM)
site_params = config_lib.GetSiteParams()
with mock.patch.object(