807376 - Spidermonkey builder names are wrong

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Steve Fink [:sfink] [:s:]]

bhearsum says he is seeing things like "spidermonkey_try Linux x86-64 %(branch)s leak test-rootanalysis build", which has both an un-interpolated %(branch)s as well as having "leak test-rootanalysis" instead of "spidermonkey_try-rootanalysis"

Comment 1

[Steve Fink [:sfink] [:s:]]

Attachment: Fill in the branch name for spidermonkey builder names, and fix the ordering of pieces

For generateBranchObjects, the config has been copied from PLATFORM_VARS and had all strings' interpolated stuff (which is only "%(branch)s", for ['base_name'] and ['mozconfig']) filled in according to the branch.

For generateSpidermonkeyObjects, we're using the raw PLATFORM_VARS, so we need to do the substitution.

Comment 2

[Steve Fink [:sfink] [:s:]]

Attachment: Give each spidermonkey object a branch name

Give each spidermonkey project object a branch name so it can be used to fill in the PLATFORM's base_name value.

Comment 3

[[e-mail] (:bhearsum)]

Comment on attachment 677073 [details] [diff] [review]
Give each spidermonkey object a branch name

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

::: mozilla/config.py
@@ +946,5 @@
>              'macosx64-lion-debug': PLATFORM_VARS['macosx64-lion-debug'],
>          },
>          'hgurl': 'http://hg.mozilla.org/',
>          'repo_path': 'integration/mozilla-inbound',
> +        'branch': 'mozilla-central',

I think this should be mozilla-inbound...r=me if you fix that upon landing.

Comment 4

[Steve Fink [:sfink] [:s:]]

(In reply to Ben Hearsum [:bhearsum] from comment #3)
> Comment on attachment 677073 [details] [diff] [review]
> Give each spidermonkey object a branch name
> 
> Review of attachment 677073 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: mozilla/config.py
> @@ +946,5 @@
> >              'macosx64-lion-debug': PLATFORM_VARS['macosx64-lion-debug'],
> >          },
> >          'hgurl': 'http://hg.mozilla.org/',
> >          'repo_path': 'integration/mozilla-inbound',
> > +        'branch': 'mozilla-central',
> 
> I think this should be mozilla-inbound...r=me if you fix that upon landing.

buildbot-configs/mozilla/config.py has a BRANCHES section, starting with this comment:

# All branches (not in project_branches) that are to be built MUST be listed here, along with their
# platforms (if different from the default set).

It then lists a bunch of branches which does NOT include mozilla-inbound.

From that, I inferred that mozilla-inbound is not considered a 'branch' in its own right.

Then again, near the end of the file is this section:

for b in BRANCHES.keys():
    if b not in ('mozilla-central', 'mozilla-inbound', 'mozilla-aurora', 'try'):
        if 'android-noion' in BRANCHES[b]['platforms']:
            del BRANCHES[b]['platforms']['android-noion']

which implies that mozilla-inbound really is a branch.

So which is it? Either way I go, it seems like one or the other of the above 2 chunks of code in config.py should be updated.

Comment 5

[[e-mail] (:bhearsum)]

(In reply to Steve Fink [:sfink] from comment #4)
> (In reply to Ben Hearsum [:bhearsum] from comment #3)
> > Comment on attachment 677073 [details] [diff] [review]
> > Give each spidermonkey object a branch name
> > 
> > Review of attachment 677073 [details] [diff] [review]:
> > -----------------------------------------------------------------
> > 
> > ::: mozilla/config.py
> > @@ +946,5 @@
> > >              'macosx64-lion-debug': PLATFORM_VARS['macosx64-lion-debug'],
> > >          },
> > >          'hgurl': 'http://hg.mozilla.org/',
> > >          'repo_path': 'integration/mozilla-inbound',
> > > +        'branch': 'mozilla-central',
> > 
> > I think this should be mozilla-inbound...r=me if you fix that upon landing.
> 
> buildbot-configs/mozilla/config.py has a BRANCHES section, starting with
> this comment:
> 
> # All branches (not in project_branches) that are to be built MUST be listed
> here, along with their
> # platforms (if different from the default set).

> It then lists a bunch of branches which does NOT include mozilla-inbound.

Yeah, that's because a bunch of them live in project_branches.py, which merge in later. That comment in archaic!

> which implies that mozilla-inbound really is a branch.

Use mozilla-inbound. That's what it's actually building!

Comment 6

[Steve Fink [:sfink] [:s:]]

http://hg.mozilla.org/build/buildbotcustom/rev/6b086c80ec2b
http://hg.mozilla.org/build/buildbot-configs/rev/89195fad4418

Comment 7

[Steve Fink [:sfink] [:s:]]

Oops, sorry, ignore the previous commit of <http://hg.mozilla.org/build/buildbot-configs/rev/89195fad4418>. It's actually for 803736.

For this one:
http://hg.mozilla.org/build/buildbot-configs/rev/ccbb470d04e6

Comment 8

[Kim Moir [:kmoir] ET]

In production

Comment 9

[[e-mail] (:bhearsum)]

Haven't seen a complaint, assuming this should be FIXED now.