Correctly initialize tracking branch in preflight rinse.

Correctly initialize tracking branch in preflight rinse.

Currently cros/master is used for the tracking branch in the preflight
rinse step. This is wrong if --tracking_branch is specified
differently in the command-line options to cbuildbot.py.

BUG=none
TEST=Ran unit tests

Change-Id: Id4fb989863ae11f57889faf6a8d8b043b81da58e

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=d2b72f7

[David James, 2010-10-26 19:23:11]

This is breaking the branch buildbot right now so please take a look.

[anush, 2010-10-26 19:24:31]

LGTM

On Tue, Oct 26, 2010 at 12:23 PM,  <davidjames@google.com> wrote:
> Reviewers: sosa, anush,
>
> Message:
> This is breaking the branch buildbot right now so please take a look.
>
> Description:
> Correctly initialize tracking branch in preflight rinse.
>
> Currently cros/master is used for the tracking branch in the preflight
> rinse step. This is wrong if --tracking_branch is specified
> differently in the command-line options to cbuildbot.py.
>
> BUG=none
> TEST=Ran unit tests
>
> Change-Id: Id4fb989863ae11f57889faf6a8d8b043b81da58e
>
> Please review this at http://codereview.chromium.org/4104005/show
>
> SVN Base: ssh://git@gitrw.chromium.org:9222/crosutils.git
>
> Affected files:
>  M bin/cbuildbot.py
>
>
> Index: bin/cbuildbot.py
> diff --git a/bin/cbuildbot.py b/bin/cbuildbot.py
> index
>
d58a72727b678f586982f2370890542210f6b950..6708c045b45069a623e9565700c999d48dd0f0e3
> 100755
> --- a/bin/cbuildbot.py
> +++ b/bin/cbuildbot.py
> @@ -224,13 +224,13 @@ def _GetVMConstants(buildroot):
>   return (vdisk_size.strip(), statefulfs_size.strip())
>
>
> -def _GitCleanup(buildroot, board):
> +def _GitCleanup(buildroot, board, tracking_branch):
>   """Clean up git branch after previous uprev attempt."""
>   cwd = os.path.join(buildroot, 'src', 'scripts')
>   if os.path.exists(cwd):
>     RunCommand(['./cros_mark_as_stable', '--srcroot=..',
>                 '--board=%s' % board,
> -                '--tracking_branch="cros/master"', 'clean'],
> +                '--tracking_branch="%s"' % tracking_branch, 'clean'],
>                cwd=cwd, error_ok=True)
>
>
> @@ -253,9 +253,9 @@ def _WipeOldOutput(buildroot):
>  # =========================== Main Commands
> ===================================
>
>
> -def _PreFlightRinse(buildroot, board):
> +def _PreFlightRinse(buildroot, board, tracking_branch):
>   """Cleans up any leftover state from previous runs."""
> -  _GitCleanup(buildroot, board)
> +  _GitCleanup(buildroot, board, tracking_branch)
>   _CleanUpMountPoints(buildroot)
>   RunCommand(['sudo', 'killall', 'kvm'], error_ok=True)
>
> @@ -490,7 +490,7 @@ def main():
>     sys.exit(1)
>
>   try:
> -    _PreFlightRinse(buildroot, buildconfig['board'])
> +    _PreFlightRinse(buildroot, buildconfig['board'], tracking_branch)
>     if options.clobber or not os.path.isdir(buildroot):
>       _FullCheckout(buildroot, tracking_branch, url=options.url)
>     else:
>
>
>

[sosa, 2010-10-26 19:50:33]

LGTM

On Tue, Oct 26, 2010 at 12:24 PM, Anush Elangovan(அனுஷ்)
<anush@chromium.org> wrote:
> LGTM
>
> On Tue, Oct 26, 2010 at 12:23 PM,  <davidjames@google.com> wrote:
>> Reviewers: sosa, anush,
>>
>> Message:
>> This is breaking the branch buildbot right now so please take a look.
>>
>> Description:
>> Correctly initialize tracking branch in preflight rinse.
>>
>> Currently cros/master is used for the tracking branch in the preflight
>> rinse step. This is wrong if --tracking_branch is specified
>> differently in the command-line options to cbuildbot.py.
>>
>> BUG=none
>> TEST=Ran unit tests
>>
>> Change-Id: Id4fb989863ae11f57889faf6a8d8b043b81da58e
>>
>> Please review this at http://codereview.chromium.org/4104005/show
>>
>> SVN Base: ssh://git@gitrw.chromium.org:9222/crosutils.git
>>
>> Affected files:
>>  M bin/cbuildbot.py
>>
>>
>> Index: bin/cbuildbot.py
>> diff --git a/bin/cbuildbot.py b/bin/cbuildbot.py
>> index
>>
d58a72727b678f586982f2370890542210f6b950..6708c045b45069a623e9565700c999d48dd0f0e3
>> 100755
>> --- a/bin/cbuildbot.py
>> +++ b/bin/cbuildbot.py
>> @@ -224,13 +224,13 @@ def _GetVMConstants(buildroot):
>>   return (vdisk_size.strip(), statefulfs_size.strip())
>>
>>
>> -def _GitCleanup(buildroot, board):
>> +def _GitCleanup(buildroot, board, tracking_branch):
>>   """Clean up git branch after previous uprev attempt."""
>>   cwd = os.path.join(buildroot, 'src', 'scripts')
>>   if os.path.exists(cwd):
>>     RunCommand(['./cros_mark_as_stable', '--srcroot=..',
>>                 '--board=%s' % board,
>> -                '--tracking_branch="cros/master"', 'clean'],
>> +                '--tracking_branch="%s"' % tracking_branch, 'clean'],
>>                cwd=cwd, error_ok=True)
>>
>>
>> @@ -253,9 +253,9 @@ def _WipeOldOutput(buildroot):
>>  # =========================== Main Commands
>> ===================================
>>
>>
>> -def _PreFlightRinse(buildroot, board):
>> +def _PreFlightRinse(buildroot, board, tracking_branch):
>>   """Cleans up any leftover state from previous runs."""
>> -  _GitCleanup(buildroot, board)
>> +  _GitCleanup(buildroot, board, tracking_branch)
>>   _CleanUpMountPoints(buildroot)
>>   RunCommand(['sudo', 'killall', 'kvm'], error_ok=True)
>>
>> @@ -490,7 +490,7 @@ def main():
>>     sys.exit(1)
>>
>>   try:
>> -    _PreFlightRinse(buildroot, buildconfig['board'])
>> +    _PreFlightRinse(buildroot, buildconfig['board'], tracking_branch)
>>     if options.clobber or not os.path.isdir(buildroot):
>>       _FullCheckout(buildroot, tracking_branch, url=options.url)
>>     else:
>>
>>
>>
>