diff --git a/recipes/recipe_modules/bot_update/resources/bot_update.py b/recipes/recipe_modules/bot_update/resources/bot_update.py index 34c47cb0b..6b8eea83c 100755 --- a/recipes/recipe_modules/bot_update/resources/bot_update.py +++ b/recipes/recipe_modules/bot_update/resources/bot_update.py @@ -418,7 +418,7 @@ def gclient_sync( args += ['--disable-syntax-validation'] for name, revision in sorted(revisions.items()): if revision.upper() == 'HEAD': - revision = 'origin/master' + revision = 'refs/remotes/origin/master' args.extend(['--revision', '%s@%s' % (name, revision)]) if patch_refs: diff --git a/recipes/recipe_modules/gclient/config.py b/recipes/recipe_modules/gclient/config.py index 1c5adc3e1..90c9c425b 100644 --- a/recipes/recipe_modules/gclient/config.py +++ b/recipes/recipe_modules/gclient/config.py @@ -314,11 +314,11 @@ def infra_internal(c): # pragma: no cover @config_ctx(includes=['infra']) def luci_gae(c): # luci/gae is checked out as a part of infra.git solution at HEAD. - c.revisions['infra'] = 'origin/master' + c.revisions['infra'] = 'refs/heads/master' # luci/gae is developed together with luci-go, which should be at HEAD. - c.revisions['infra/go/src/go.chromium.org/luci'] = 'origin/master' + c.revisions['infra/go/src/go.chromium.org/luci'] = 'refs/heads/master' c.revisions['infra/go/src/go.chromium.org/gae'] = ( - gclient_api.RevisionFallbackChain('origin/master')) + gclient_api.RevisionFallbackChain('refs/heads/master')) m = c.got_revision_mapping del m['infra'] m['infra/go/src/go.chromium.org/gae'] = 'got_revision' @@ -326,9 +326,9 @@ def luci_gae(c): @config_ctx(includes=['infra']) def luci_go(c): # luci-go is checked out as a part of infra.git solution at HEAD. - c.revisions['infra'] = 'origin/master' + c.revisions['infra'] = 'refs/heads/master' c.revisions['infra/go/src/go.chromium.org/luci'] = ( - gclient_api.RevisionFallbackChain('origin/master')) + gclient_api.RevisionFallbackChain('refs/heads/master')) m = c.got_revision_mapping del m['infra'] m['infra/go/src/go.chromium.org/luci'] = 'got_revision' @@ -337,18 +337,18 @@ def luci_go(c): def luci_py(c): # luci-py is checked out as part of infra just to have appengine # pre-installed, as that's what luci-py PRESUBMIT relies on. - c.revisions['infra'] = 'origin/master' + c.revisions['infra'] = 'refs/heads/master' c.revisions['infra/luci'] = ( - gclient_api.RevisionFallbackChain('origin/master')) + gclient_api.RevisionFallbackChain('refs/heads/master')) m = c.got_revision_mapping del m['infra'] m['infra/luci'] = 'got_revision' @config_ctx(includes=['infra']) def recipes_py(c): - c.revisions['infra'] = 'origin/master' + c.revisions['infra'] = 'refs/heads/master' c.revisions['infra/recipes-py'] = ( - gclient_api.RevisionFallbackChain('origin/master')) + gclient_api.RevisionFallbackChain('refs/heads/master')) m = c.got_revision_mapping del m['infra'] m['infra/recipes-py'] = 'got_revision' diff --git a/tests/bot_update_coverage_test.py b/tests/bot_update_coverage_test.py index db81077bd..e3afee7c7 100755 --- a/tests/bot_update_coverage_test.py +++ b/tests/bot_update_coverage_test.py @@ -212,7 +212,8 @@ class BotUpdateUnittests(unittest.TestCase): '--revision', idx_first_revision+1) idx_third_revision = args.index('--revision', idx_second_revision+1) self.assertEqual(args[idx_first_revision+1], 'somename@unmanaged') - self.assertEqual(args[idx_second_revision+1], 'src@origin/master') + self.assertEqual( + args[idx_second_revision+1], 'src@refs/remotes/origin/master') self.assertEqual(args[idx_third_revision+1], 'src/v8@deadbeef') return self.call.records