400770 - Version/config bumps for FF2.0.0.9 release

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P1)

Description

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

Placeholder bug for the FF2.0.0.9 release. Waiting for development codefreeze.

Comment 1

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

Attachment: bootstrap.cfg changes for FF2009

bootstrap.cfg changes for FF2009

Comment 2

[Robert Helmer [:rhelmer]]

Comment on attachment 285932 [details] [diff] [review]
bootstrap.cfg changes for FF2009

leave branchTag as MOZILLA_1_8_BRANCH and set:

RelbranchOverride = GECKO181_20071004_RELBRANCH

Comment 3

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

Attachment: [checked in] master.cfg changes

1) Previously, we changed automation to stop before the update, so we could manually setup config files. Those config files are now generated automatically, so no longer need to stop. Hence now undoing that earlier change.

2) Use the newest automation tag (M6).

Comment 4

[Robert Helmer [:rhelmer]]

Comment on attachment 285934 [details] [diff] [review]
[checked in] master.cfg changes

Checking in production/master.cfg;
/cvsroot/mozilla/tools/buildbot-configs/automation/production/master.cfg,v  <--  master.cfg
new revision: 1.6; previous revision: 1.5
done

Comment 5

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

Attachment: bootstrap.cfg changes for FF2009

2nd attempt.

Comment 6

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

Attachment: [checked in] bootstrap.cfg changes for FF2009

3rd attempt, fixes typo.

Comment 7

[Robert Helmer [:rhelmer]]

Comment on attachment 285936 [details] [diff] [review]
[checked in] bootstrap.cfg changes for FF2009  

Checking in fx-moz18-bootstrap.cfg;
/cvsroot/mozilla/tools/release/configs/fx-moz18-bootstrap.cfg,v  <--  fx-moz18-bootstrap.cfg
new revision: 1.20; previous revision: 1.19
done

Comment 8

[Robert Helmer [:rhelmer]]

mozilla/tools/release has been tagged RELEASE_AUTOMATION_M6

Comment 9

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

Attachment: [checked in] additional master.cfg changes

Bringing production Updates in sync with staging Updates, so now -test bits are automatically staged.

Comment 10

[Robert Helmer [:rhelmer]]

Comment on attachment 285941 [details] [diff] [review]
[checked in] additional master.cfg changes

Checking in production/master.cfg;
/cvsroot/mozilla/tools/buildbot-configs/automation/production/master.cfg,v  <--  master.cfg
new revision: 1.7; previous revision: 1.6
done

Comment 11

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

Attachment: prepare module.ver version.txt milestone.txt for FF2.0.0.9

Prepare these files:

browser/app/module.ver 
browser/config/version.txt 
config/milestone.txt

...to have the "2.0.0.9" or "1.8.1.9" string in place, ready for the automation to start from.

Comment 12

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

Attachment: prepare module.ver version.txt milestone.txt for FF2.0.0.9

2nd attempt. 

Realized that the automation will be looking for the "pre" string, so need to use "2.0.0.9pre" or "1.8.1.9pre". Should have done this the first time.

Comment 13

[Robert Helmer [:rhelmer]]

Comment on attachment 285976 [details] [diff] [review]
prepare module.ver version.txt milestone.txt for FF2.0.0.9

This looks good, but can you do client.mk as well? All of the CO_TAG section needs to be MOZILLA_1_8_BRANCH (to match $branchTag in bootstrap.cfg)

Comment 14

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

Attachment: prepare module.ver version.txt milestone.txt client.mk for FF2.0.0.9

Comment 15

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

Comment on attachment 286056 [details] [diff] [review]
prepare module.ver version.txt milestone.txt client.mk for FF2.0.0.9

This is the same as previous patch #285976, except for adding client.mk also... as requested in review, to keep things neat!

Comment 16

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

Comment on attachment 286056 [details] [diff] [review]
prepare module.ver version.txt milestone.txt client.mk for FF2.0.0.9

The client.mk changes aren't right, I'm afraid.

The relevant code is at
http://mxr.mozilla.org/seamonkey/source/tools/release/Bootstrap/Step/Tag/Bump.pm#94

It's looking to replace lines like
  MOZ_CO_TAG           = MOZILLA_1_8_BRANCH

From that code it's not necessary to do NSPR_CO_TAG or NSS_CO_TAG, just the other three.

Comment 17

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

Attachment: prepare module.ver version.txt milestone.txt client.mk for FF2.0.0.9

Fixing client.mk to use MOZILLA_1_8_BRANCH.

Comment 18

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

Comment on attachment 286061 [details] [diff] [review]
prepare module.ver version.txt milestone.txt client.mk for FF2.0.0.9

all good, r+

Comment 19

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

Checked in attachment 286061 [details] [diff] [review]:

Checking in client.mk;
/cvsroot/mozilla/client.mk,v  <--  client.mk
new revision: 1.245.2.38.8.2; previous revision: 1.245.2.38.8.1
done
Checking in browser/app/module.ver;
/cvsroot/mozilla/browser/app/module.ver,v  <--  module.ver
new revision: 1.11.2.19.2.2; previous revision: 1.11.2.19.2.1
done
Checking in browser/config/version.txt;
/cvsroot/mozilla/browser/config/version.txt,v  <--  version.txt
new revision: 1.4.18.18.4.2; previous revision: 1.4.18.18.4.1
done
Checking in config/milestone.txt;
/cvsroot/mozilla/config/milestone.txt,v  <--  milestone.txt
new revision: 3.27.2.17.4.2; previous revision: 3.27.2.17.4.1
done

Comment 20

[Daniel Veditz [:dveditz]]

(In reply to comment #16)
> The client.mk changes aren't right, I'm afraid.
> 
> The relevant code is [...] looking to replace lines like
>   MOZ_CO_TAG           = MOZILLA_1_8_BRANCH

This is broken. Developers have now pulled this branch "the standard way" and attempted to check in to the _RELEASE tag, because that's what client.mk pulled. Now they'll think they're pulling the RELBRANCH and will end up checking in back on the MOZILLA_1_8_BRANCH. Unlike the static tag that _will_ work and the developer may not realize that's what they've done.

We may try not to use these relbranches for much, but just this year we've had 2003, 2006, 2007 and now 2009 on relbranches. It's easier to fix the build tools than to change working habits for lots of developers for whom these are already exceptional cases.

client.mk should pull what developers build and check-in on.

Bump.pm just has $branchTag in that section of the code, can't that be the GECKO181_20071004_RELBRANCH just as easily? Where is that variable set?

Comment 21

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

Attachment: [checked in] update time cutoff to match bonsai query

with all the other patches already landed, the only change needed here is the newly announced cutoff time.

Comment 22

[Robert Helmer [:rhelmer]]

Comment on attachment 286186 [details] [diff] [review]
[checked in] update time cutoff to match bonsai query

Checking in fx-moz18-bootstrap.cfg;
/cvsroot/mozilla/tools/release/configs/fx-moz18-bootstrap.cfg,v  <--  fx-moz18-bootstrap.cfg
new revision: 1.21; previous revision: 1.20
done

Comment 23

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

After the tag step finished, I ran:

$ cvs -d :pserver:[e-mail]:/cvsroot rdiff -uR -r FIREFOX_2_0_0_8_RELEASE -r FIREFOX_2_0_0_9_RELEASE mozilla/ >& /tmp/cvsrdiff.out

Then, dveditz and myself read through the output and confirmed:
- that all the expected changes were present
- the surprise changes (some camino files, one OS/2 file) were ok
- the tag step did correctly pickup all files (build paranoia about silent failures!).

All looks good.

Comment 24

[Robert Helmer [:rhelmer]]

Moved the RELEASE_AUTOMATION_M6 tag onto revision 1.25 of mozilla/tools/release/Bootstrap/Step/Updates.pm to pick up john's patch in bug 373995 attachment 286324 [details] [diff] [review]

Comment 25

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

Attachment: [checked in] tweak moz18-firefox-*.cfg

Workaround these cfg files using "aus2-staging.m.o", changing them to use "aus2.m.o". This is good enough for now, but we should revisit to use something like an externalAusServer like we do in the staging environment...

Comment 26

[Robert Helmer [:rhelmer]]

Comment on attachment 286328 [details] [diff] [review]
[checked in] tweak moz18-firefox-*.cfg

Looks great, passes minimal local testing:

Checking in moz18-firefox-linux.cfg;
/cvsroot/mozilla/testing/release/updates/moz18-firefox-linux.cfg,v  <--  moz18-firefox-linux.cfg
new revision: 1.19; previous revision: 1.18
done
Checking in moz18-firefox-mac.cfg;
/cvsroot/mozilla/testing/release/updates/moz18-firefox-mac.cfg,v  <--  moz18-firefox-mac.cfg
new revision: 1.20; previous revision: 1.19
done
Checking in moz18-firefox-win32.cfg;
/cvsroot/mozilla/testing/release/updates/moz18-firefox-win32.cfg,v  <--  moz18-firefox-win32.cfg
new revision: 1.19; previous revision: 1.18
done

Comment 28

[Doug Shelton]

(In reply to comment #27)
> *** Bug 402375 has been marked as a duplicate of this bug. ***
> 
Sorry for the duplicate.  Imagine, me and the BeOS port actually getting ahead of things for once.  :)

Comment 31

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

Attachment: version bump up to 2.0.0.10pre

Now that we have shipped FF2.0.0.9, we need to land the patch bumping versions forward, so the nightly builds will show 2.0.0.10pre.

Comment 32

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

Comment on attachment 287373 [details] [diff] [review]
version bump up to 2.0.0.10pre

I'll land this, and also do the configs for the perf test boxes & nagios monitoring.

Comment 33

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

Attachment: Version bumps as landed

Commands to get the files:

cvs co -r MOZILLA_1_8_BRANCH mozilla/config/milestone.txt mozilla/browser/app/module.ver mozilla/browser/config/version.txt
cvs co -r MOZILLA_1_8_BRANCH_test_perf mozilla/tools/tinderbox-configs/firefox
cvs co mozilla/tools/tinderbox-configs/monitoring/Firefox_mozilla1.8.txt mozilla/tools/tinderbox-configs/monitoring/XULRunner_mozilla1.8.txt

assuming CVSROOT is set in the environment. 

Something odd is happening with the copyright symbol in the WIN32_MODULE_COPYRIGHT line of module.ver, which prevents the patch from applying on a new checkout (on mac). Maybe your editor is munging it ?

Comment 34

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

(In reply to comment #33)
> Something odd is happening with the copyright symbol in the
> WIN32_MODULE_COPYRIGHT line of module.ver, which prevents the patch from
> applying on a new checkout (on mac). Maybe your editor is munging it ?

Referring to attachment 287373 [details] [diff] [review] here.

Comment 35

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

(In reply to comment #32)
> (From update of attachment 287373 [details] [diff] [review])
> I'll land this, and also do the configs for the perf test boxes & nagios
> monitoring.
Oh, rats, sorry about that, cf. I'm used to doing just the first 3 files, and forgot those two. Let me reconstruct a (larger) patch and attach.

Comment 36

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

From IRC with cf: he's already landed my patch above, as well as a patch for the two other config files.

Comment 37

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

Attachment: version bumps for the 2009 free software builds [checked in]

Comment 38

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

Comment on attachment 287432 [details] [diff] [review]
version bumps for the 2009 free software builds [checked in]

r+ and landed:

Checking in linux/tinder-config.pl;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl,v  <--  tinder-config.pl
new revision: 1.1.14.3.2.7; previous revision: 1.1.14.3.2.6
done
Checking in macosx/tinder-config.pl;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl,v  <--  tinder-config.pl
new revision: 1.14.2.7; previous revision: 1.14.2.6
done
Checking in win32/tinder-config.pl;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl,v  <--  tinder-config.pl
new revision: 1.4.2.6; previous revision: 1.4.2.5
done

Comment 39

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

free software builds now shipped and available at ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.9/contrib/free-software.

Comment 40

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

Thats all, folks.