397425 - update staging-build-console to Fx 2007

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P2)

Description

[Robert Helmer [:rhelmer]]

staging-build-console currently builds Firefox 2.0.0.4, in order to change that we need:

1) bump versions in Makefile, rebuild mirror
2) bump version in bbot master.cfg (only one place right now, the fake signing step)
3) bump versions in bootstrap.cfg

#1/#2 are easy, #3 is a little tricky because 2007 was based on a relbranch, so this'll be a good test for respin support :)

Comment 1

[Robert Helmer [:rhelmer]]

Attachment: [checked in]Makefile and buildbot diffs to make staging-b-c use 2007

Comment 2

[Robert Helmer [:rhelmer]]

Attachment: modified fx-moz18-bootstrap.cfg

Modified version of what we used for 2007rc2, diff against mozilla/tools/release/configs/fx-moz18-bootstrap.cfg

It might be simplest to start with this, and simply skip the "tag" step on staging, until we get respin support set up..

Alternatively, if you can tell me how to configure this so it's doing a respin, that'd be great too :)

Comment 3

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

(In reply to comment #2)
> Created an attachment (id=282195) [details]
> modified fx-moz18-bootstrap.cfg
> 
> Modified version of what we used for 2007rc2, diff against
> mozilla/tools/release/configs/fx-moz18-bootstrap.cfg

It looks like the attachment is the entire newly modified bootstrap.cfg, not the output of "diff -u". Can you verify if the correct file is attached?

Comment 4

[Nick Thomas [:nthomas] (UTC+12)]

Comment on attachment 282194 [details] [diff] [review]
[checked in]Makefile and buildbot diffs to make staging-b-c use 2007

Did you mean to put rc2 in the master.cfg change ? Looks that way from the bootstrap.cfg

Also, do we still need the tag removal for FIREFOX_2_0_0_7_MINIBRANCH?  Can't see it on client.mk or browser/config/version.txt using cvs stat -v. 

Otherwise looks good, r+.

Comment 5

[Robert Helmer [:rhelmer]]

(In reply to comment #3)
> (In reply to comment #2)
> > Created an attachment (id=282195) [details] [details]
> > modified fx-moz18-bootstrap.cfg
> > 
> > Modified version of what we used for 2007rc2, diff against
> > mozilla/tools/release/configs/fx-moz18-bootstrap.cfg
> 
> It looks like the attachment is the entire newly modified bootstrap.cfg, not
> the output of "diff -u". Can you verify if the correct file is attached?
> 

Yes, this file is not checked in so there's nothing to diff against. 

Comment 6

[Robert Helmer [:rhelmer]]

(In reply to comment #4)
> (From update of attachment 282194 [details] [diff] [review])
> Did you mean to put rc2 in the master.cfg change ? Looks that way from the
> bootstrap.cfg

Hmm yeah it depends if we're going to do this as a respin or not.. this is a good point though. Once the r? for bootstrap.cfg is done I'll know what to do :)

> Also, do we still need the tag removal for FIREFOX_2_0_0_7_MINIBRANCH?  Can't
> see it on client.mk or browser/config/version.txt using cvs stat -v. 

Yeah good point, I can comment that out. Since this was done manually on the relbranch I didn't bother with the MINIBRANCH.

Comment 7

[Robert Helmer [:rhelmer]]

Comment on attachment 282195 [details]
modified fx-moz18-bootstrap.cfg

redoing this

Comment 8

[Robert Helmer [:rhelmer]]

Attachment: [checked in]changes from current 2004 config to 2007 rc2 respin

changes merged from mozilla/tools/release/configs/fx-moz180-bootstrap.cfg, hence the minor formatting tweaks. It should make diffing this against the production config easier now and in the future.

Comment 9

[Robert Helmer [:rhelmer]]

Landed first patch, plus s/rc1/rc2/ in master.cfg:

Checking in buildbot-configs/automation/staging/master.cfg;
/cvsroot/mozilla/tools/buildbot-configs/automation/staging/master.cfg,v  <--  master.cfg
new revision: 1.2; previous revision: 1.1
done
Checking in release/Makefile;
/cvsroot/mozilla/tools/release/Makefile,v  <--  Makefile
new revision: 1.9; previous revision: 1.8
done

Comment 10

[Robert Helmer [:rhelmer]]

Landed bootstrap config:
Checking in release/configs/fx-moz18-staging-bootstrap.cfg;
/cvsroot/mozilla/tools/release/configs/fx-moz18-staging-bootstrap.cfg,v  <--  fx-moz18-staging-bootstrap.cfg
new revision: 1.2; previous revision: 1.1
done

Comment 11

[Robert Helmer [:rhelmer]]

Attachment: [checked in]do not remove _RELEASE and _RC1 tags (this is a respin)

(r=cf as per irc)

Checking in Makefile;
/cvsroot/mozilla/tools/release/Makefile,v  <--  Makefile
new revision: 1.10; previous revision: 1.9
done

Comment 12

[Robert Helmer [:rhelmer]]

Staging now building 2007, modulo some unrelated bootstrap bugs.