From 444e3a6de0215b5f43aef676a2740e5814c657fa Mon Sep 17 00:00:00 2001 From: Chris Sosa Date: Wed, 24 Nov 2010 00:54:48 -0800 Subject: [PATCH] Revert "Change url of manifest to use ssh one as opposed to mirrored repo." This reverts commit 4847031faad12e0f7b2fd3f047c77cad7b0a4003. TBR=Required for pushes to work. Change-Id: I4f07407e518045ea77fa61942af58f57e68b5f8f --- bin/cbuildbot.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bin/cbuildbot.py b/bin/cbuildbot.py index cc30200787..aef3ec2719 100755 --- a/bin/cbuildbot.py +++ b/bin/cbuildbot.py @@ -59,6 +59,13 @@ def RepoSync(buildroot, rw_checkout=False, retries=_DEFAULT_RETRIES): # is needed so that the buildbot can kill us if git is not making # progress. RunCommand(['repo', '--trace', 'sync'], cwd=buildroot) + if rw_checkout: + # Always re-run in case of new git repos or repo sync + # failed in a previous run because of a forced Stop Build. + RunCommand(['repo', 'forall', '-c', 'git', 'config', + 'url.ssh://git@gitrw.chromium.org:9222.pushinsteadof', + 'http://git.chromium.org/git'], cwd=buildroot) + retries = 0 except: retries -= 1 @@ -508,7 +515,7 @@ def main(): parser.add_option('-t', '--tracking-branch', dest='tracking_branch', default='cros/master', help='Run the buildbot on a branch') parser.add_option('-u', '--url', dest='url', - default='ssh://git@gitrw.chromium.org:9222/manifest', + default='http://git.chromium.org/git/manifest', help='Run the buildbot on internal manifest') (options, args) = parser.parse_args()