731697 - Build directories and builder names need to be differentiated across products

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[John Hopkins (:jhopkins)]

We need to differentiate builder names like "Linux try build" and builddirs like 'try-linux' across the Thunderbird and Firefox products so they don't collide.

Basically, we want 'try-linux' to remain for Firefox but 'tb-try-linux' for Thunderbird.  Same idea with builder names - they shouldn't change for Firefox.

Comment 1

[John Hopkins (:jhopkins)]

Attachment: proposed patch

This patch passes 'checkconfig' but no testing beyond that has been done yet.

Comment 2

[[e-mail] (:bhearsum)]

Comment on attachment 602028 [details] [diff] [review]
proposed patch

Review of attachment 602028 [details] [diff] [review]:
-----------------------------------------------------------------

r=me with the below comments addressed.

::: common.py
@@ +32,5 @@
>      return uuid.uuid4().hex
>  
> +def productPrefix(product):
> +    if product == 'thunderbird':
> +        return 'tb'

I think you probably want tb- here for readability's sake.

::: misc.py
@@ +813,5 @@
>      nomergeBuilders.extend(periodicPgoBuilders) # these should never, ever merge
>      extra_args['treeStableTimer'] = None
>  
>      branchObjects['schedulers'].append(scheduler_class(
> +        name=productPrefix(pf['product_name']) + name,

I think it's unnecessary to use productPrefix here. Scheduler names aren't a risky thing to change. You can just prepend the product name to all of them to keep things simpler.

::: process/release.py
@@ -332,1 @@
>  

Can we save the patch to this file for when Tb release integration happens? I'm just a bit concerned about it landing untested.

Comment 3

[[e-mail] (:bhearsum)]

(In reply to Ben Hearsum [:bhearsum] from comment #2)
> Comment on attachment 602028 [details] [diff] [review]
> proposed patch
> 
> Review of attachment 602028 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> r=me with the below comments addressed.
> 
> ::: common.py
> @@ +32,5 @@
> >      return uuid.uuid4().hex
> >  
> > +def productPrefix(product):
> > +    if product == 'thunderbird':
> > +        return 'tb'
> 
> I think you probably want tb- here for readability's sake.
> 
> ::: misc.py
> @@ +813,5 @@
> >      nomergeBuilders.extend(periodicPgoBuilders) # these should never, ever merge
> >      extra_args['treeStableTimer'] = None
> >  
> >      branchObjects['schedulers'].append(scheduler_class(
> > +        name=productPrefix(pf['product_name']) + name,
> 
> I think it's unnecessary to use productPrefix here. Scheduler names aren't a
> risky thing to change. You can just prepend the product name to all of them
> to keep things simpler.

We talked about this on the phone and decided to leave it as is. So, r=me with the tb prefix fixed, and removing the release.py part of the patch.

Comment 4

[[e-mail] (:bhearsum)]

Comment on attachment 602028 [details] [diff] [review]
proposed patch

Removing review per comment #3.

Comment 5

[John Hopkins (:jhopkins)]

Landed in http://hg.mozilla.org/build/buildbotcustom/rev/a7eab7ada08b