824802 - Do not merge the spidermonkey try builds

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

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

catlee noticed in bug 821097 that the spidermonkey try builds are getting merged.

Comment 1

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

Attachment: Do not merge the spidermonkey try builds

Some barely related cleanups mixed in.

Comment 2

[[e-mail] (:bhearsum)]

Comment on attachment 695825 [details] [diff] [review]
Do not merge the spidermonkey try builds

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

::: misc.py
@@ +2442,5 @@
>              }
>  
>  def generateSpiderMonkeyObjects(project, config, SLAVES):
>      builders = []
> +    branch = config['branch']

This doesn't seem to be used...

Comment 3

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

(In reply to Ben Hearsum [:bhearsum] from comment #2)
> Comment on attachment 695825 [details] [diff] [review]
> Do not merge the spidermonkey try builds
> 
> Review of attachment 695825 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: misc.py
> @@ +2442,5 @@
> >              }
> >  
> >  def generateSpiderMonkeyObjects(project, config, SLAVES):
> >      builders = []
> > +    branch = config['branch']
> 
> This doesn't seem to be used...

-    branch = os.path.basename(config['repo_path'])
+    branch = config['branch']

I don't think that change ever does anything (as in, the old definition is always the same as the new), but it seems simpler. And it's used when creating the builder struct:

+            builder = {'name': name,
                     'builddir': '%s_%s_spidermonkey-%s' % (branch, platform, variant),
                     'slavebuilddir': reallyShort('%s_%s_spidermonkey-%s' % (branch, platform, variant)),

Comment 4

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

http://hg.mozilla.org/build/buildbotcustom/rev/f1b6ee2e822e

Comment 5

[Hal Wine [:hwine] use NI!]

in production

Comment 6

[Justin Wood (:Callek)]

Comment on attachment 695825 [details] [diff] [review]
Do not merge the spidermonkey try builds

This was backed out along with Bug 691177 yesterday because it wasn't clear if it had a hand in breaking things.

Comment 7

[[e-mail] (:bhearsum)]

Details pls.

Comment 8

[Justin Wood (:Callek)]

(In reply to Ben Hearsum [:bhearsum] from comment #7)
> Details pls.

see https://bugzilla.mozilla.org/show_bug.cgi?id=691177#c26 to c29

Comment 9

[Justin Wood (:Callek)]

so, it looks like this patch wasn't the cause of problems, but we do have some interesting results in the scheduler/builder `names` for Spidermonkey that deserve a followup:

e.g. this patch resulted in the following
=========
$ diff -U10 */build*/dump*
--- clean/build_scheduler/dump_master.txt       2013-01-02 19:48:28 -0500
+++ patched/build_scheduler/dump_master.txt     2013-01-02 20:14:06 -0500
@@ -4215,22 +4215,22 @@
 <buildbot.schedulers.basic.Scheduler> {'builderNames': ['OS X 10.7 64-bit mozilla-central leak test spidermonkey
_mozilla-inbound-dtrace build',
                   'OS X 10.7 64-bit mozilla-central leak test spidermonkey_mozilla-inbound-warnaserrdebug build'
,
                   'Linux x86-64 mozilla-central leak test spidermonkey_mozilla-inbound-rootanalysis build',
                   'Linux x86-64 mozilla-central leak test spidermonkey_mozilla-inbound-warnaserrdebug build',
                   'OS X 10.7 mozilla-central spidermonkey_mozilla-inbound-warnaserr build',
                   'Linux x86-64 mozilla-central spidermonkey_mozilla-inbound-warnaserr build',
                   'Linux mozilla-central spidermonkey_mozilla-inbound-warnaserr build',
                   'Linux mozilla-central leak test spidermonkey_mozilla-inbound-warnaserrdebug build'],
  'change_filter': <ChangeFilter on branch == integration/mozilla-inbound>,
  'fileIsImportant': <function isImportant>,
- 'name': 'mozilla-inbound_spidermonkey',
- 'properties': {'scheduler': 'mozilla-inbound_spidermonkey'},
+ 'name': 'mozilla-central_spidermonkey',
+ 'properties': {'scheduler': 'mozilla-central_spidermonkey'},
  'treeStableTimer': None}
=========

Now, nothing references the schedulers name/properties directly so its fine for now, but note the switch to "mozilla-central" when its an inbound scheduler, (the buildernames show both "inbound" and "central" with no associated change from before or after this patch)

Comment 10

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

Attachment: spidermonkey inbound job should use inbound branch

This should prevent the unwanted change, as well as changing the builder name to not mix branches.

generateSpidermonkeyObjects fills in a format string containing "%(branch)s", but it has to do it manually because it doesn't go through the generateBranchObjects stuff. So it uses the spidermonkey project object to supply the value. That was incorrectly set to mozilla-central, which is where that came from in both places.

Comment 11

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

Attachment: cross-check repo_path and branch for spidermonkey jobs

With our current naming conventions, it never makes sense for the repo_path and the branch to mismatch.

Comment 12

[[e-mail] (:bhearsum)]

Comment on attachment 697297 [details] [diff] [review]
cross-check repo_path and branch for spidermonkey jobs

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

Can you add a better message to this assertion when you land?

Comment 13

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

http://hg.mozilla.org/build/buildbot-configs/rev/1be174049208
http://hg.mozilla.org/build/buildbotcustom/rev/d44f14546374
http://hg.mozilla.org/build/buildbotcustom/rev/83c7cc5db915

Comment 14

[[e-mail] (:bhearsum)]

This is in production - Steve, can you do some tests to make sure it's working?