441945 - Rename Firefox/Mozilla2 tinderboxen now that FF3 has shipped (to Mozilla1.9.0/Firefox)

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P3)

Description

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

On cvs-trunk, the tinderbox http://tinderbox.mozilla.org/showbuilds.cgi?tree=Firefox should be renamed to http://tinderbox.mozilla.org/showbuilds.cgi?tree=Mozilla1.9.0

On hg-mozilla-central, the tinderbox http://tinderbox.mozilla.org/showbuilds.cgi?tree=Mozilla2 should be renamed to http://tinderbox.mozilla.org/showbuilds.cgi?tree=Firefox

Making this change also requires updating various build/unittest/talos machines.

Comment 1

[[e-mail] (:bhearsum)]

To be clear, we're not actually renaming the Trees a the tinderbox server level. We are simply making all new builds report to new trees. Eg, current Firefox machines will report to Mozilla1.9.0 in the future, and current Mozilla2 machines will report to Firefox in the future.

Comment 2

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

This will need downtime while we update all builders for this change. Currently thinking of scheduling downtime for this for Friday 4th July. 

Comment 3

[[e-mail] (:bhearsum)]

Here's a list of things that need to be done before/during the switchover:
* Update master.cfg of moz2-master, perfmaster, moz2-unittest, unittest master (1.9)
* Update tinder-config.pl on trunk, plus test_mem branch (1.9)
* Create a Mozilla1.9.0 or Firefox3.0 tree.
* Update mozilla/tools/tinderbox-configs/monitoring to reflect the new state of tinderboxes.
* Get IT to stop watching the Mozilla2 tree, and start watching Mozilla1.9.0 or Firefox3.0
* Update Messages on Mozilla2, Firefox, and Mozilla1.9.0 or Firefox3.0 trees to inform people of the changes.

Anything else?

Comment 4

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

(joduinn hopes this doesnt go too far into bikeshedding!)

Some discussion on newsgroup on whether we should call this renamed/moved tree
"Firefox3.0" or "Mozilla1.9.0". The discussion seems to hinge around whether we
should have non-firefox machines on the same tinderbox page as the firefox
machines.

In the past, for branches, we've grouped machines by the repo branch they were
on. So, all mozilla1.8.0 machines were on mozilla1.8.0 tinderbox, and all
mozilla1.8 machines were on the mozilla1.8 tinderbox. 

For trunk, we had Firefox, Thunderbird, XULRunner, Mobile as separate
tinderboxen. 

1) Based on how we've done branch releases in the past, I feel we should be
putting all mozilla1.9.0 machines on a mozilla1.9.0 tinderbox.

2) If we decide to call this tree "Firefox3.0", we'll need to setup new trees
for Thunderbird3.0, mobile3.0 and xulrunner3.0?

Comment 5

[Daniel Veditz [:dveditz]]

"Thunderbird 3.0" is going to ship from mozilla-central somewhere around or on the Firefox 3.1 release code. mobile is likewise planning big changes that aren't going to land on the 1.9.0 branch. dunno if xulrunner is planning any 1.9.0-based releases.

Comment 6

[Samuel Sidler (old account; do not CC)]

I think we should call this Firefox3.0. Thunderbird can stay on their on tree until they branch (likely with 1.9.1 as Dan said) as can Mobile. Is the XULRunner tree building 1.9.1 or 1.9? I'd be okay with the "Firefox3.0" tree having XULRunner on it as well.

Comment 7

[Benjamin Smedberg]

I don't think that sharing a single tree across multiple apps is going to scale that well... the Firefox tree is so wide already, that adding additional machines (XR, TB, mobile, whatever) will make it even more unmanageable.

We haven't had nearly as many tinderboxes reporting on previous branches for lack of unit and redundant talos test coverage, so the situation wasn't nearly as bad.

Comment 8

[Robert Kaiser]

We currently have SeaMonkey-Mozilla1.8 for SeaMonkey 1.x, coming from the Mozilla 1.8 branch.
We should not mix product names with platform versions, IMHO, so either "Firefox3[.0]" or "Firefox-Mozilla1.9[.0]" sound correct to me when we do a Firefox-specific waterfall page.

Thunderbird, SeaMonkey and I think also Sunbird/calendar will move over to being based on 1.9.1 for their next releases and drop 1.9.0 completely, from what I know, so their current waterfall pages work just fine and don't need to be cared about in this bug.

Comment 9

[[e-mail] (:bhearsum)]

It sounds like everyone is OK with Using "Firefox3.0" - is that correct?

On a bit of a side note:
With regard to tb, xr, mobile, etc. Because tb and xr have so few machines compared to Firefox it may make sense for them to share. But really, it doesn't matter to me.

Mobile is a different matter. When I setup the first "Mobile" buildbot I created a separate Tinderbox page for it -- in retrospect, this was silly. There's two aspects to a "Mobile" build as I understand it. 1) XULrunner SDK built for linux arm (and probably other platforms in the future). This belongs whereever XULRunner is, IMHO. 2) Fennec. As I understand it, this is the actual browser, and belongs with whatever Firefox branch it is building from/related to (again, IMHO).

Comment 10

[[e-mail] (:bhearsum)]

Attachment: [checked in] firefox 3.0.x unit tests -> Firefox3.0 tree

Comment 11

[[e-mail] (:bhearsum)]

Attachment: [checked in] Firefox 3.0.x build machines -> Firefox3.0 tree

Comment 12

[[e-mail] (:bhearsum)]

Attachment: Firefox 3.0.x leak test machines -> Firefox3.0 tree

Comment 13

[[e-mail] (:bhearsum)]

Attachment: [checked in] mozilla-central/Firefox 3.1 builds + leak test + unit test -> Firefox tree

Comment 14

[[e-mail] (:bhearsum)]

Attachment: [checked in] Firefox 3.0.x talos -> Firefox3.0 tree; mozilla-central/Firefox 3.1 talos -> Firefox tree

Comment 15

[[e-mail] (:bhearsum)]

Attachment: [checked in] changes to tinderbox monitoring

Reed, I'm not sure what, if anything, IT has to do to make these changes so I figured you were the right person to review this.

Comment 16

[Reed Loden [:reed]]

Comment on attachment 328005 [details] [diff] [review]
[checked in] changes to tinderbox monitoring

No tier 1 machines on 1.9.1 yet? ;)

This does need backend nagios changes, which I've just made. Since I've already made them, you won't have nagios monitoring for these two checks until you commit this patch and move all the tinderboxen. Let me know if that's going to be a problem.

Comment 17

[[e-mail] (:bhearsum)]

(In reply to comment #16)
> (From update of attachment 328005 [details] [diff] [review])
>
> This does need backend nagios changes, which I've just made. Since I've already
> made them, you won't have nagios monitoring for these two checks until you
> commit this patch and move all the tinderboxen. Let me know if that's going to
> be a problem.
> 

Please turn back on nagios monitoring for the rest of today/tonight...if no one from IT is around tomorrow after I land these changes we can live without it for a few hours until someone *does* come online.

Thanks for the help here, reed.

Comment 18

[Reed Loden [:reed]]

(In reply to comment #17)
> Please turn back on nagios monitoring for the rest of today/tonight...if no one
> from IT is around tomorrow after I land these changes we can live without it
> for a few hours until someone *does* come online.

Done. I left the Firefox3.0 additions, so I'll ack nagios pages for missing files today, as they'll recover tomorrow.

Comment 19

[alice nodelman [:alice] [:anode]]

Attachment: [checked in] Firefox 3.0.x talos -> Firefox3.0 tree; mozilla-central/Firefox 3.1 talos -> Firefox tree (talos stage machines)

Comment 20

[[e-mail] (:bhearsum)]

Comment on attachment 328027 [details] [diff] [review]
[checked in] Firefox 3.0.x talos -> Firefox3.0 tree; mozilla-central/Firefox 3.1 talos -> Firefox tree (talos stage machines)

>Index: master.cfg
> c['sources'].append(TinderboxPoller(
>     tinderboxURL = "http://tinderbox.mozilla.org",
>-    tree = "Mozilla2",
>+    tree = "Actionmonkey",

Looks fine, the existing tree seems out of date though

Comment 21

[:Gavin Sharp [email: [e-mail]]]

(In reply to comment #9)
> Mobile is a different matter. When I setup the first "Mobile" buildbot I
> created a separate Tinderbox page for it -- in retrospect, this was silly.
> 1) XULrunner SDK built for linux arm (and probably other platforms in the
> future). This belongs whereever XULRunner is, IMHO. 

Sure, I guess that could report to http://tinderbox.mozilla.org/showbuilds.cgi?tree=XULRunner . Are those machines maintained? They look like they're pulling from CVS still.

> 2) Fennec. As I understand it, this is the actual browser, and belongs with
> whatever Firefox branch it is building from/related to (again, IMHO).

Fennec and Firefox really are entirely separate, at least for the foreseeable future, so having them both report to the "Firefox" tree would just be confusing. I think we do need a "Mobile" tree, and if we're going to have one anyways and I think it makes sense to have the ARM XULRunner box report there too.

Comment 22

[[e-mail] (:bhearsum)]

Comment on attachment 327991 [details] [diff] [review]
[checked in] firefox 3.0.x unit tests -> Firefox3.0 tree

Checking in master.cfg;
/cvsroot/mozilla/tools/buildbot-configs/testing/unittest/master.cfg,v  <--  master.cfg
new revision: 1.36; previous revision: 1.35
done

Comment 23

[[e-mail] (:bhearsum)]

Comment on attachment 327992 [details] [diff] [review]
[checked in] Firefox 3.0.x build machines -> Firefox3.0 tree

Checking in linux/tinder-config.pl;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl,v  <--  tinder-config.pl
new revision: 1.29; previous revision: 1.28
done
Checking in macosx/tinder-config.pl;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl,v  <--  tinder-config.pl
new revision: 1.48; previous revision: 1.47
done
Checking in win32/tinder-config.pl;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl,v  <--  tinder-config.pl
new revision: 1.38; previous revision: 1.37
done

Comment 24

[[e-mail] (:bhearsum)]

Comment on attachment 327994 [details] [diff] [review]
[checked in] mozilla-central/Firefox 3.1 builds + leak test + unit test -> Firefox tree

landed in changeset:   120:7e57cfe69df7

Comment 25

[[e-mail] (:bhearsum)]

Comment on attachment 327995 [details] [diff] [review]
[checked in] Firefox 3.0.x talos -> Firefox3.0 tree; mozilla-central/Firefox 3.1 talos -> Firefox tree

Checking in master.cfg;
/cvsroot/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg,v  <--  master.cfg
new revision: 1.72; previous revision: 1.71
done

Comment 26

[[e-mail] (:bhearsum)]

Comment on attachment 328005 [details] [diff] [review]
[checked in] changes to tinderbox monitoring

RCS file: /cvsroot/mozilla/tools/tinderbox-configs/monitoring/Firefox_mozilla1.9.0.txt,v
done
Checking in Firefox_mozilla1.9.0.txt;
/cvsroot/mozilla/tools/tinderbox-configs/monitoring/Firefox_mozilla1.9.0.txt,v  <--  Firefox_mozilla1.9.0.txt
initial revision: 1.1
done
Removing Firefox_trunk.txt;
/cvsroot/mozilla/tools/tinderbox-configs/monitoring/Firefox_trunk.txt,v  <--  Firefox_trunk.txt
new revision: delete; previous revision: 1.21
done
Removing Tier1_Firefox.txt;
/cvsroot/mozilla/tools/tinderbox-configs/monitoring/Tier1_Firefox.txt,v  <--  Tier1_Firefox.txt
new revision: delete; previous revision: 1.13
done
RCS file: /cvsroot/mozilla/tools/tinderbox-configs/monitoring/Tier1_Firefox3.0.txt,v
done
Checking in Tier1_Firefox3.0.txt;
/cvsroot/mozilla/tools/tinderbox-configs/monitoring/Tier1_Firefox3.0.txt,v  <--  Tier1_Firefox3.0.txt
initial revision: 1.1
done

Comment 27

[[e-mail] (:bhearsum)]

Comment on attachment 328027 [details] [diff] [review]
[checked in] Firefox 3.0.x talos -> Firefox3.0 tree; mozilla-central/Firefox 3.1 talos -> Firefox tree (talos stage machines)

Checking in master.cfg;
/cvsroot/mozilla/tools/buildbot-configs/testing/talos/perf-staging/master.cfg,v  <--  master.cfg
new revision: 1.17; previous revision: 1.16
done

Comment 28

[[e-mail] (:bhearsum)]

Attachment: [checked in] the right diff

Checking in firefox/linux/tinder-config.pl;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl,v  <--  tinder-config.pl
new revision: 1.3.2.22; previous revision: 1.3.2.21
done
Checking in firefox/macosx/tinder-config.pl;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl,v  <--  tinder-config.pl
new revision: 1.24.2.11; previous revision: 1.24.2.10
done
Checking in firefox/win32/tinder-config.pl;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl,v  <--  tinder-config.pl
new revision: 1.22.2.5; previous revision: 1.22.2.4
done

Comment 29

[[e-mail] (:bhearsum)]

All of the relevant buildbot masters were reconfig'ed. I'm keeping an eye on the tinderboxes to make sure all of the correct machines are 'active' for each tree. Talos will take awhile to come up still.

Comment 30

[[e-mail] (:bhearsum)]

Looks like everything has come back up...the only thing left to do here is get Nagios to pay attention to the correct files.

Comment 31

[Bill Gianopoulos [:WG9s]]

Well, it looks like the Firefox tinderbox page, although it is reporting Trunk builds, seems to be reporting 1.9.0 branch check-ins.

Comment 32

[[e-mail] (:bhearsum)]

Good point Bill.

Passing back to IT to get this fixed. Specifically, we (currently) don't want anything to show up in the 'Guilty' column. I couldn't find a way to do this within the regular tinderbox/bonsai admin pages.

Comment 33

[Reed Loden [:reed]]

I fixed that issue several days ago...