Closed Bug 481079 Opened 11 years ago Closed 11 years ago

Tagging Tb 2.0.0.x doesn't bump config/milestone.txt

Categories

(Release Engineering :: General, defect, P2)

defect

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: nthomas, Assigned: nthomas)

References

Details

Attachments

(1 file)

We used to build Firefox before T'bird on the 1.8.1 branch, and re-use the relbranch. The automation bumped Firefox's version and the Gecko revision in config/milestone.txt, then T'bird would just get its own version. Now that we're not building Firefox there we have to bump Gecko when we build Thunderbird.

The relevant bit of code is at
  http://mxr.mozilla.org/seamonkey/source/tools/release/Bootstrap/Step/Tag/Bump.pm#62
Priority: -- → P2
This should do the trick I think. It allows more flexibility than just removing the |if ($product eq 'firefox')| test, should hell freeze over and we have to do another Fx 2.0.0.x release. Untested as yet, but the cvs mirror on staging-stage is now up to date for doing that if you think this approach is OK. Also updates the staging config for Tb (mostly syncing to the fx one for machine names) to allow a reasonable test.
Attachment #366483 - Flags: review?(bhearsum)
Comment on attachment 366483 [details] [diff] [review]
Use a config setting to control bumping milestone.txt

Seems fine to me. If we do have to do another Firefox on this branch we'll have to make sure to adjust the tb config when we do the equivalent tb release.
Attachment #366483 - Flags: review?(bhearsum) → review+
Attachment #366483 - Flags: checked‑in+ checked‑in+
bug 482715 blocks turning on some staging VMs and therefore testing Tb2.0.0.x
Depends on: 482715
In tb2.0.0.22 staging run, with bumpMilestoneTxt = 1:

log: Running shell command:
log:   arg0: perl
log:   arg1: /builds/tags/THUNDERBIRD_2_0_0_22_BUILD1/tools/release/version-bump.pl
log:   arg2: -w
log:   arg3: /builds/tags/THUNDERBIRD_2_0_0_22_BUILD1/cvsroot/mozilla
log:   arg4: -t
log:   arg5: THUNDERBIRD_2_0_0_22_RELEASE
log:   arg6: -a
log:   arg7: mail
log:   arg8: -v
log:   arg9: 2.0.0.22
log:   arg10: -m
log:   arg11: 1.8.1.22
log:   arg12: client.mk
log:   arg13: mail/app/module.ver
log:   arg14: mail/config/version.txt
log:   arg15: config/milestone.txt

and it appropriately bumped and checked in all 4 files.
In a Fx2.0.0.22 staging run, with bumpMilestoneTxt = 0:

log: Running shell command:
log:   arg0: perl
log:   arg1: /builds/tags/FIREFOX_2_0_0_22_BUILD1/tools/release/version-bump.pl
log:   arg2: -w
log:   arg3: /builds/tags/FIREFOX_2_0_0_22_BUILD1/cvsroot/mozilla
log:   arg4: -t
log:   arg5: FIREFOX_2_0_0_22_RELEASE
log:   arg6: -a
log:   arg7: browser
log:   arg8: -v
log:   arg9: 2.0.0.22
log:   arg10: -m
log:   arg11: 1.8.1.22
log:   arg12: client.mk
log:   arg13: browser/app/module.ver
log:   arg14: browser/config/version.txt

which correctly leaves config/milestone.txt alone. Just need to create a new tag and leave some notes about using that for upcoming releases.
Created RELEASE_AUTOMATION_M14 to pick up this bug (and the rest of the rest of bug 483232). Left reminders in
 https://wiki.mozilla.org/Releases/Thunderbird_2.0.0.22/BuildNotes
 https://wiki.mozilla.org/Releases/Firefox_3.0.11/BuildNotes
to use that tag.
Status: ASSIGNED → RESOLVED
Closed: 11 years ago
Resolution: --- → FIXED
Product: mozilla.org → Release Engineering
You need to log in before you can comment on or make changes to this bug.