Release Management/Merge Documentation: Difference between revisions

From MozillaWiki
Jump to navigation Jump to search
m (update categories)
 
(30 intermediate revisions by 9 users not shown)
Line 1: Line 1:
{{DISPLAYTITLE:Merge Day documentation}}
{{RELEASE_MANAGEMENT_UPDATE_NEEDED}}
'''NOTE: For the next merge, we need to check for interface changes that are unpaired to UUID changes'''
'''NOTE: For the next merge, we need to check for interface changes that are unpaired to UUID changes'''


'''NOTE: Release Management is trying out scripts to automate the merge day process, the work on updating the wiki and complete automation is in progress. Hence let us know if you find anything missing here'''
'''NOTE: Release Engineering is now performing all code merges. The work on updating the wiki and complete automation is in progress. Hence let both RelMan & RelEng know if you find anything missing here'''


=Archive of Past Merge Days=
=Archive of Past Merge Days=
Line 15: Line 18:


= Mozilla-Beta -> Mozilla-Release Merge =
= Mozilla-Beta -> Mozilla-Release Merge =
<font color="red" size="+2">'''For Release Engineering, this page has been superseded by https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Perform_mozilla-beta_-.3E_mozilla-release_migration .'''</font>
<br /><br />
* '''Make sure that there isn't an l10n locales bug that needs to filed like: {{Bug|826825}}'''
* '''Make sure that there isn't an l10n locales bug that needs to filed like: {{Bug|826825}}'''


== Close the Beta Tree ==
== Close the Beta Tree ==
* Use https://treestatus.mozilla.org/ to close mozilla-beta. No need to reopen till the next merge from Aurora->Beta (or a beta re-spin is necessary)
* Use https://treestatus.mozilla.org/ to close mozilla-beta.
** Please use the "Remember previous state" option, so you can easily restore the previous status messages when you are finished (there will be a restore button at the bottom of the page).
** Please use the "Remember previous state" option, so you can easily restore the previous status messages when you are finished (there will be a restore button at the bottom of the page).
** In order to change tree statuses, your browserID email needs to be added with sheriff permissions (ping edmorley/philor/catlee or ask in #developers).
** In order to change tree statuses, your browserID email needs to be added with sheriff permissions (ping edmorley/philor/catlee or ask in #developers).
** mozilla-beta will remain closed until after the Aurora->Beta uplift the following Monday (or a beta re-spin is necessary).


== Sync mozilla-beta to mozilla-release ==
== Sync mozilla-beta to mozilla-release ==
Line 34: Line 43:


== Beta to Release Merge day helper Script ==
== Beta to Release Merge day helper Script ==
(Beta2Release) Merge day helper script at: [https://github.com/mozilla/relman-tools/blob/master/merge_day_scripts/beta2release.py https://github.com/mozilla/relman-tools]
Merge day helper script: [https://hg.mozilla.org/build/tools/file/default/release/beta2release.py beta2release.py]
ALWAYS GET A FRESH COPY IN CASE THERE HAVE BEEN UPDATES!!!
Use script beta2release.py for this merge day


===Clobber mozilla-release builders===
===Clobber mozilla-release builders===
Go to https://secure.pub.build.mozilla.org/clobberer/?branch=mozilla-release and clobber the mozilla-release builders
Go to https://secure.pub.build.mozilla.org/clobberer/?branch=mozilla-release and clobber the mozilla-release builders
===Clone, Tag, update [Taken care by the helper script beta2release.py]===
 
==== Running beta2release.py ====
 
* Save this the script in the directory where you have checked out the repos needed to do the beta to release merge.
 
* Script will take-care of tagging, return here when ready to push mozilla-beta
# follow instructions in script combined with wiki commands
** Next step is to run the script : python beta2release.py
''' hg -R mozilla-beta push ssh://hg.mozilla.org/releases/mozilla-beta '''
 
===Edit desktop config ===
# edit mozilla-release/browser/locales/shipped-locales file if you need to remove some beta locales (eg mn, sw)
# script takes care of config changes
 
=== Edit mobile mozconfigs ===
'''Note: use 'official' for release mozconfigs, not 'release''''
<pre>
# script takes care of config changes
 
</pre>
 
===Commit Changes===
# commit the changes
#script takes care of the commits
 
# push back
# hg -R mozilla-release push -f ssh://hg.mozilla.org/releases/mozilla-release
 
===Now go watch results===
https://tbpl.mozilla.org/?tree=Mozilla-Release


== L10N sync ==
=== Running beta2release.py ===
Example invocation:
python beta2release.py --remove-locale sw --remove-locale ms
* Script will take-care of tagging of mozilla-beta and wil promt you to push the tag to mozilla-beta. Push by
hg -R mozilla-beta push ssh://hg.mozilla.org/releases/mozilla-beta
* Script will continue by pulling mozilla-beta to mozilla-release, merging the heads in a fast-forward manner (using <tt>hg debugsetparents</tt>), adjusting shipped-locales and changing some congigs.
* Once the diff is shown and reviewed on screen, the script will commit the changes.
* Push the final bits by
hg -R mozilla-release push --new-branch ssh://hg.mozilla.org/releases/mozilla-release
* The push should be available at https://tbpl.mozilla.org/?tree=Mozilla-Release
=== Uplift locales ===
Helper script: [http://hg.mozilla.org/build/braindump/file/default/releases-related/beta2release_l10n.sh beta2release_l10n.sh]
* Note you need permission to be able to run this script successfully.File a server ops bug similar to {{bug|869654}}
* Note you need permission to be able to run this script successfully.File a server ops bug similar to {{bug|869654}}
 
* ATM, the script uses <tt>~/.ssh/ffxbld_dsa</tt> key to push l10n repos on befalf on ffxbld user. It can be run from cruncher.
[http://hg.mozilla.org/build/braindump/file/default/releases-related Script available here (beta2release_l10n.sh)]
* The script is based on [http://hg.mozilla.org/users/axel_mozilla.com/branch-l10n/file/default/merge_l10n.py Axel's merge script]
 
'''Note''' for August 24th beta->release uplift, you'll want to incorporate [http://hg.mozilla.org/users/axel_mozilla.com/branch-l10n/file/d019b6817a31/merge_l10n.py#l12 Axel's merge script] to deal with when release locale repos don't have anything committed to them yet.
 
'''Also note''' the merge part of this script does not work properly period, and doesn't push to repo
 
<pre>
#!/bin/bash
set -x
set -e
 
HG_HOST=hg.mozilla.org
HG_USER=lsblakk@mozilla.com
repo=mozilla-release
release_repo_path=releases/l10n/mozilla-release
beta_repo_path=releases/l10n/mozilla-beta
wd=`pwd`/l10n
 
mkdir -p $wd
cd $wd
 
for l in `wget -q -O- http://$HG_HOST/releases/$repo/raw-file/default/browser/locales/shipped-locales | grep -v en-US | awk '{print $1}'`; do
    hg clone http://$HG_HOST/$release_repo_path/$l
    hg clone http://$HG_HOST/$beta_repo_path/$l $l.beta
    release_rev=`hg -R $l id -i -r default`
    beta_rev=`hg -R $l.beta id -i -r default`
    hg -R $l pull $l.beta
    hg -R $l up -C default
    heads=`hg -R $l heads --template '{rev}\n' default|wc -l|tr -d ' '`
    if [ "x$heads" != "x1" ]; then
        hg -R $l up -C -r $beta_rev
        HGMERGE=true hg -R $l merge -r $release_rev
        hg -R $l revert -a -y --no-backup -r $beta_rev
        hg -R $l commit -u $HG_USER -m "Merge from mozilla-beta. CLOSED TREE a=release"
    fi
    hg -R $l diff -r $beta_rev -r default
    hg -R $l push -f ssh://$HG_HOST/$release_repo_path/$l
done
</pre>
 
==Go Re-Open Beta Tree==
* Announce completion of merge in #release-drivers (ping Standard8 and Callek)


=Merge Day (Central, Aurora, Beta)=
=Merge Day (Central, Aurora, Beta)=


Merge day helper repo : https://github.com/mozilla/relman-tools/merge_day_scripts '''ALWAYS GET A FRESH COPY IN CASE THERE HAVE BEEN UPDATES!!!'''
The bulk of the merge day work is performed by Release Engineering. However, Release Management is responsible for providing product behavior information.


* Use the merge_helper.py script
Prior to sending the "Please bump & merge m-c, m-a, m-b" email, the follow steps need to be performed:
* File a bug to disable Aurora updates like {{bug|931832}} but for the version you are moving off Aurora to Beta
* Make sure the trees are green and as much as possible land the aurora approved patches
* Make sure the trees are green and as much as possible land the aurora approved patches
== Check IIDs that need to be bumped ==
* Find IIDs that need to be bumped from Aurora to Beta: https://github.com/jwir3/checkiid
* Find IIDs that need to be bumped from Aurora to Beta: https://github.com/jwir3/checkiid
** the command is -I (not small 'L' which is what it looks like on the readme)
** the command is -I (big 'i', not small 'L' which is what it looks like on the readme)
  # run this in an updated mozilla-aurora dir
  # run this in an updated mozilla-aurora dir
  hg diff -r FIREFOX_AURORA_{{BETA_VERSION}}_END -r tip -I "**.idl" > /tmp/firefox.diff
  hg diff -r FIREFOX_AURORA_{{BETA_VERSION}}_END -r tip -I "**.idl" > /tmp/firefox.diff
python /path/to/checkiid.py repo /tmp/firefox.diff
** ie: idl files that changed on Aurora and '''didn't''' get an IID bump
** ie: idl files that changed on Aurora and '''didn't''' get an IID bump
** need to get landed before {{AURORA_VERSION}} Beta 1
** Track on http://dxr.mozilla.org/ (''Log'' link on the right) + http://hg.mozilla.org the new/remove methods, method profile updated, etc. Note that ''%{C++'' declaration changes does not need to see any IID bump (no change in the vtable).<br />Renaming of an argument in the function/method profile does NOT impact the IDL.
** a const change does not require a IID bump. {{Bug|1061656}}
** report bug and n-i developers+managers to see them fixed. {{Bug|1023109}}
** '''OR''', fix them yourself if you feel confident enough. To get a new IID, on irc, ''/msg firebot uuid'' should be enough or use ''./mach update-uuids'' (safer)
** need to get landed before go-to-build for {{AURORA_VERSION}} Beta 1 (but does not block the merge-day)
* Make final determination if any locales need to be changed for any step. (Gather bug #'s for the needed actions.)
** The default is: central->aurora should reset to aurora, aurora->beta should take the content from aurora


== Get all of the Repos ==
== Requesting the Merge ==
mkdir ~/Mozilla/
cd ~/Mozilla/
hg clone http://hg.mozilla.org/mozilla-central/ mozilla-central
hg clone http://hg.mozilla.org/releases/mozilla-aurora/ mozilla-aurora
hg clone http://hg.mozilla.org/releases/mozilla-beta/ mozilla-beta


== Set each Repo up for Pushing ==
Send an email to r-d with the subject: "Please bump & merge m-c, m-a, m-b", with the following contents:
* all locales confirmed (or a list of changes needed with bug numbers)
* no config changes needed (or a list of features to enable/disable with bug numbers)
* confirm that all IDL checks have been done, and that RelMan will ensure that any remaining IDL issues are addressed prior to go-to-build for m-a.


See https://developer.mozilla.org/en/Mercurial_FAQ#Required_configuration
<pre>
Subject: Please bump & merge m-c, m-a, m-b


== Set up HG Extensions ==
Please kick off the merge process for m-c, m-a, m-b.


Edit ~/.hgrc to include
Locales: The locales should be handled with the default process:  central->aurora should reset to aurora, aurora->beta should take the content from aurora
 
Configuration changes: There are no configuration changes we are aware of at this time.
[extensions]
IDL: The IDL files have been checked and there are no known issues with bumped IIDs.
transplant=
</pre>
mq=
rebase=
graphlog=
 
== Close the Trees ==
DO NOT CLOSE mozilla-central FOR MERGING
* Use https://treestatus.mozilla.org/ to close the trees.
* Please use the "Remember previous state" option, so you can easily restore the previous status messages when you are finished (there will be a restore button at the bottom of the page).
* In order to change tree statuses, your browserID email needs to be added with sheriff permissions (ping edmorley/philor/catlee or ask in #developers).
 
== Ping Release Engineering ==
Release Engineering will need to pause the hg-git sync to [http://git.mozilla.org/?p=releases/gecko.git;a=summary gecko.git]. If we don't pause that job, and we push the merges to central, aurora, and beta, we will most likely get the next gecko train's code into the wrong b2g versioned branch, and partners will have to deal with a non-fastforward commit.
 
== Get Helper Script (do this every merge day) ==
# Make sure you get a fresh copy in case there have been updates since last merge
git clone https://github.com/mozilla/relman-tools/merge_day_scripts
use the merge_helper.py script for this merge day
 
* Open two terminal windows, be in the top dir of your cloned repos in both
* In one of them run the helper script (in the other you can run the manual steps: tagging, pushing, etc):
python merge_helper.py
# follow instructions in script combined with wiki commands
 
=== mozilla-central tag/bump from {{CENTRAL_VERSION}} to {{NEXT_VERSION}} ===
==== Preparation and Tagging ====
* '''Send note to dev-planning and #developers announcing that the merge is about to start'''
* Script will do tagging of mozilla_central -> FIREFOX_AURORA_{{CENTRAL_VERSION}}_BASE
* Script will do version bumps
 
==== Verify & Push Your Changes ====
# check the diffs to ensure nothing additional has been changed
hg push
 
* '''Announce to dev-planning and #developers that the m-c bump is completed'''
 
=== mozilla-aurora {{AURORA_VERSION}} to mozilla-beta uplift ===
==== Review tagging of mozilla-aurora and push ====
# review
cd ~/Mozilla/mozilla-aurora
hg push
 
==== Review tagging of mozilla-beta and continue to push ====
cd ~/mozilla/mozilla-beta
hg push
 
==== Verify the script Pulled from Aurora into Beta ====
hg pull -u -r FIREFOX_BETA_{{AURORA_VERSION}}_BASE http://hg.mozilla.org/releases/mozilla-aurora
 
* Script does version bumps and branding changes
 
==== Verify the Commits related to version bumps and branding changes ====


==== Clobber & push ====
Please be available for any question on irc or email.
* Use the '''Regular Clobbers''' @ [https://secure.pub.build.mozilla.org/clobberer/?branch=mozilla-beta clobberer] to clobber all beta builders and then...
# ping Standard8 in #r-d to warn about push
hg push -f


===mozilla-central {{CENTRAL_VERSION}} to mozilla-aurora uplift===
RelEng will take the process from there, and will (eventually) reply with an email to r-d with a subject of "Bump & Merge m-c,m-a,m-b complete". When that email is received, verify that the contents confirm:
==== Don't forget to throttle the Aurora channel ====
* wikimo version templates have been updated
* Use [http://mzl.la/1etHGr0 this Bugzilla template] to file a bug requesting the disabling of Aurora updates (eg: bug 700794) - until we have sign off from QA
** '''Make sure QA is aware (an email to r-d is best)'''


After that email is received, continue.


==== Script will Tag and commit, continue to push ====
==Completing the Merge==
cd ~/mozilla/mozilla-aurora
hg push
 
====Verify that script Pulled from m-c into Aurora ====
 
==== Verify the Diff/Commit of Version Bumps/Branding changes ====
# check the diffs to ensure nothing additional has been changed
 
 
* Script will disable profiling changes
 
==== Verify the Diff/Commit of profiling changes ====
 
==== Verify the Diff/Commit of mozconfig dtrace & instruments changes (had trouble last time the change manually if needed)====
hg diff
hg commit -m "Remove dtrace & instruments in mozconfigs on Aurora as per bug 748669 CLOSED TREE ba=release"
hg out
 
==== L10n data changes ====
# revert to previous Aurora locales - l10n drivers can file post-merge bugs to add new locales
hg revert -r FIREFOX_AURORA_{{AURORA_VERSION}}_END browser/locales/*-locales
hg revert -r FIREFOX_AURORA_{{AURORA_VERSION}}_END mobile/android/locales/*-locales
 
==== Verify & Commit l10n changes====
$ hg commit -m "Merging in l10n changes NO BUG CLOSED TREE IGNORE BROKEN CHANGESETS ba=release"
$ hg out
 
==== Clobber & push ====
* Use the '''Regular Clobbers''' @ [https://secure.pub.build.mozilla.org/clobberer/?branch=mozilla-aurora clobberer] to clobber all aurora builders and then...
# ping Standard8 (or TB driver) in #r-d to warn about push
hg push -f
 
=Completing the Merge=
* Email dev.planning and let them know the merge is complete
* Email dev.planning and let them know the merge is complete
* Notify #developers
* Notify #developers
* Notify Release Engineering
* Notify Release Engineering
* re-open Beta tree (leaving Aurora closed for stabilization)
* re-open Beta tree (leaving Aurora closed for stabilization) - https://treestatus.mozilla.org/
* Update the merge docs as needed to keep them up to date for next merge day
* Update the merge docs as needed to keep them up to date for next merge day
* Make sure you did file the bug on Aurora update throttling
* Make sure you did file the bug on Aurora update throttling
* Remind Jorge that he needs to prevent an add-on compatibility bump for the hotfix add-ons
* Remind Jorge that he needs to prevent an add-on compatibility bump for the hotfix add-ons


= Change Template Version Numbers =
== Verify the Template Version Numbers ==
Now that everything has been bumped edit the following so our Channel Notes and other wiki pages have the correct info and queries now (increment by 1)
Now that everything has been completed, verify that the template version numbers are correct. They are very important for daily cronjobs that read the values and nag many many engineers based on triage queries that use them.
* [https://wiki.mozilla.org/index.php?title=Template:NEXT_VERSION&action=edit NEXT_VERSION]
 
* [https://wiki.mozilla.org/index.php?title=Template:CENTRAL_VERSION&action=edit CENTRAL_VERSION]
* [https://wiki.mozilla.org/index.php?title=Template:NEXT_VERSION NEXT_VERSION]
* [https://wiki.mozilla.org/index.php?title=Template:AURORA_VERSION&action=edit AURORA_VERSION]
* [https://wiki.mozilla.org/index.php?title=Template:CENTRAL_VERSION CENTRAL_VERSION]
* [https://wiki.mozilla.org/index.php?title=Template:BETA_VERSION&action=edit BETA_VERSION]
* [https://wiki.mozilla.org/index.php?title=Template:AURORA_VERSION AURORA_VERSION]
* [https://wiki.mozilla.org/index.php?title=Template:RELEASE_VERSION&action=edit RELEASE_VERSION]
* [https://wiki.mozilla.org/index.php?title=Template:BETA_VERSION BETA_VERSION]
* [https://wiki.mozilla.org/index.php?title=Template:NextReleaseDate&action=edit NextReleaseDate]
* [https://wiki.mozilla.org/index.php?title=Template:RELEASE_VERSION RELEASE_VERSION]
* [https://wiki.mozilla.org/index.php?title=Template:B2G_DEV_VERSION B2G_DEV_VERSION]
* [https://wiki.mozilla.org/index.php?title=Template:ESR_VERSION ESR_VERSION] (every 7 releases)
* [https://wiki.mozilla.org/index.php?title=Template:NextReleaseDate NextReleaseDate]
** Which causes these to auto-update (with the magic of math!)
** Which causes these to auto-update (with the magic of math!)
** [https://wiki.mozilla.org/index.php?title=Template:FIREFOX_SHIP_DATE&action=edit FIREFOX_SHIP_DATE] (the next ship date)
** [https://wiki.mozilla.org/index.php?title=Template:FIREFOX_SHIP_DATE FIREFOX_SHIP_DATE] (the next ship date)
** [https://wiki.mozilla.org/index.php?title=Template:FIREFOX_MERGE_DATE&action=edit FIREFOX_MERGE_DATE] (the next ship date)
** [https://wiki.mozilla.org/index.php?title=Template:FIREFOX_MERGE_DATE FIREFOX_MERGE_DATE] (the next ship date)
** [https://wiki.mozilla.org/index.php?title=Template:CURRENT_CYCLE&action=edit CURRENT_CYCLE] based upon [https://wiki.mozilla.org/RapidRelease/Calendar the calendar]
** [https://wiki.mozilla.org/index.php?title=Template:CURRENT_CYCLE CURRENT_CYCLE] based upon [https://wiki.mozilla.org/RapidRelease/Calendar the calendar]
== Calculating the current Firefox release # and next release date ==
== Calculating the current Firefox release # and next release date ==
The expression reads <pre>floor(Firefox 23 + ((current time - Firefox 23 release date) / 6 weeks))</pre>. This expression counts the number of full 6 week increments since Firefox 23 and adds the total to 23 to give the current release number. Similarly, we can calculate the next release date with <pre>{{#time: Y-m-d | @{{#expr: (3628800 - (({{#time: U | now}} - {{#time: U | 6 Aug 2013}}) mod 3628800)) + {{#time: U | now}}}}}}</pre>. In this case we calculate the time since the Firefox 23 release, take the remainder from dividing by 6 weeks, and subtract that from the current time. This results in the number of days until the next release. Add that to the current time to produce the next release date.
The expression reads <pre>floor(Firefox 23 + ((current time - Firefox 23 release date) / 6 weeks))</pre>. This expression counts the number of full 6 week increments since Firefox 23 and adds the total to 23 to give the current release number. Similarly, we can calculate the next release date with <pre>{{#time: Y-m-d | @{{#expr: (3628800 - (({{#time: U | now}} - {{#time: U | 6 Aug 2013}}) mod 3628800)) + {{#time: U | now}}}}}}</pre>. In this case we calculate the time since the Firefox 23 release, take the remainder from dividing by 6 weeks, and subtract that from the current time. This results in the number of days until the next release. Add that to the current time to produce the next release date.


[[category:Release_Management|M]]
[[category:Release_Management|M]]
[[Category:Release_Management:Processes|Merge]]

Latest revision as of 09:16, 5 April 2018

⚡ Warning: This page hasn't been updated recently and may not be fully accurate or complete. In case of doubt, contact our release managers.

NOTE: For the next merge, we need to check for interface changes that are unpaired to UUID changes

NOTE: Release Engineering is now performing all code merges. The work on updating the wiki and complete automation is in progress. Hence let both RelMan & RelEng know if you find anything missing here

Archive of Past Merge Days

Release_Management/Merge_Days

What's missing here

This is a document in process, and will also be replaced by automation at some point. In the meantime it outlines the manual steps required on a 'Merge Day' when Mozilla-Aurora becomes Mozilla-Beta and Mozilla-Central becomes Mozilla-Aurora.

ATM there is nothing in here about:

  • synching all the L10N repos (current doc is here for repos: L10n:Migration, and dashboard process is coming)
    • There have been issues with missing l10n locales on first beta1 builds. In m-b --> m-r migration, RelEng run l10n-sync script to uplift beta locales to release, which ensures that all locales have content in release repo and are migrated correctly. However, this script currently doesn't get used for m-a --> m-b merge day (need to check with Axel on his process here).
  • Thunderbird/SeaMonkey merging, that doc is at Thunderbird/Release_Driving/Rapid_Release_Activities/Merge_Repositories

Mozilla-Beta -> Mozilla-Release Merge

For Release Engineering, this page has been superseded by https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Perform_mozilla-beta_-.3E_mozilla-release_migration .



  • Make sure that there isn't an l10n locales bug that needs to filed like: bug 826825

Close the Beta Tree

  • Use https://treestatus.mozilla.org/ to close mozilla-beta.
    • Please use the "Remember previous state" option, so you can easily restore the previous status messages when you are finished (there will be a restore button at the bottom of the page).
    • In order to change tree statuses, your browserID email needs to be added with sheriff permissions (ping edmorley/philor/catlee or ask in #developers).
    • mozilla-beta will remain closed until after the Aurora->Beta uplift the following Monday (or a beta re-spin is necessary).

Sync mozilla-beta to mozilla-release

Mercurial repositories used for final releases should be synced from mozilla-beta.

Tip of default on mozilla-release should be tagged and closed. mozilla-beta should be tagged and pulled. It creates new tip of default on mozilla-release. See Aurora specific sync mechanics for the details.

L10N repositories uses noop (dummy) merge if needed to simplify localizers life.


To handle this process use the following scripts.

Beta to Release Merge day helper Script

Merge day helper script: beta2release.py

Clobber mozilla-release builders

Go to https://secure.pub.build.mozilla.org/clobberer/?branch=mozilla-release and clobber the mozilla-release builders

Running beta2release.py

Example invocation: 

python beta2release.py --remove-locale sw --remove-locale ms
  • Script will take-care of tagging of mozilla-beta and wil promt you to push the tag to mozilla-beta. Push by
hg -R mozilla-beta push ssh://hg.mozilla.org/releases/mozilla-beta
  • Script will continue by pulling mozilla-beta to mozilla-release, merging the heads in a fast-forward manner (using hg debugsetparents), adjusting shipped-locales and changing some congigs.
  • Once the diff is shown and reviewed on screen, the script will commit the changes.
  • Push the final bits by
hg -R mozilla-release push --new-branch ssh://hg.mozilla.org/releases/mozilla-release

Uplift locales

Helper script: beta2release_l10n.sh

  • Note you need permission to be able to run this script successfully.File a server ops bug similar to bug 869654
  • ATM, the script uses ~/.ssh/ffxbld_dsa key to push l10n repos on befalf on ffxbld user. It can be run from cruncher.
  • The script is based on Axel's merge script

Merge Day (Central, Aurora, Beta)

The bulk of the merge day work is performed by Release Engineering. However, Release Management is responsible for providing product behavior information.

Prior to sending the "Please bump & merge m-c, m-a, m-b" email, the follow steps need to be performed:

  • Make sure the trees are green and as much as possible land the aurora approved patches
  • Find IIDs that need to be bumped from Aurora to Beta: https://github.com/jwir3/checkiid
    • the command is -I (big 'i', not small 'L' which is what it looks like on the readme)
# run this in an updated mozilla-aurora dir
hg diff -r FIREFOX_AURORA_128_END -r tip -I "**.idl" > /tmp/firefox.diff
python /path/to/checkiid.py repo /tmp/firefox.diff
    • ie: idl files that changed on Aurora and didn't get an IID bump
    • Track on http://dxr.mozilla.org/ (Log link on the right) + http://hg.mozilla.org the new/remove methods, method profile updated, etc. Note that %{C++ declaration changes does not need to see any IID bump (no change in the vtable).
      Renaming of an argument in the function/method profile does NOT impact the IDL.
    • a const change does not require a IID bump. bug 1061656
    • report bug and n-i developers+managers to see them fixed. bug 1023109
    • OR, fix them yourself if you feel confident enough. To get a new IID, on irc, /msg firebot uuid should be enough or use ./mach update-uuids (safer)
    • need to get landed before go-to-build for 54 Beta 1 (but does not block the merge-day)
  • Make final determination if any locales need to be changed for any step. (Gather bug #'s for the needed actions.)
    • The default is: central->aurora should reset to aurora, aurora->beta should take the content from aurora

Requesting the Merge

Send an email to r-d with the subject: "Please bump & merge m-c, m-a, m-b", with the following contents:

  • all locales confirmed (or a list of changes needed with bug numbers)
  • no config changes needed (or a list of features to enable/disable with bug numbers)
  • confirm that all IDL checks have been done, and that RelMan will ensure that any remaining IDL issues are addressed prior to go-to-build for m-a.
Subject: Please bump & merge m-c, m-a, m-b

Please kick off the merge process for m-c, m-a, m-b.

Locales: The locales should be handled with the default process:  central->aurora should reset to aurora, aurora->beta should take the content from aurora
Configuration changes: There are no configuration changes we are aware of at this time.
IDL: The IDL files have been checked and there are no known issues with bumped IIDs.

Please be available for any question on irc or email.

RelEng will take the process from there, and will (eventually) reply with an email to r-d with a subject of "Bump & Merge m-c,m-a,m-b complete". When that email is received, verify that the contents confirm:

  • wikimo version templates have been updated

After that email is received, continue.

Completing the Merge

  • Email dev.planning and let them know the merge is complete
  • Notify #developers
  • Notify Release Engineering
  • re-open Beta tree (leaving Aurora closed for stabilization) - https://treestatus.mozilla.org/
  • Update the merge docs as needed to keep them up to date for next merge day
  • Make sure you did file the bug on Aurora update throttling
  • Remind Jorge that he needs to prevent an add-on compatibility bump for the hotfix add-ons

Verify the Template Version Numbers

Now that everything has been completed, verify that the template version numbers are correct. They are very important for daily cronjobs that read the values and nag many many engineers based on triage queries that use them.

Calculating the current Firefox release # and next release date

The expression reads 

floor(Firefox 23 + ((current time - Firefox 23 release date) / 6 weeks))

. This expression counts the number of full 6 week increments since Firefox 23 and adds the total to 23 to give the current release number. Similarly, we can calculate the next release date with 

{{#time: Y-m-d | @{{#expr: (3628800 - (({{#time: U | now}} - {{#time: U | 6 Aug 2013}}) mod 3628800)) + {{#time: U | now}}}}}}

. In this case we calculate the time since the Firefox 23 release, take the remainder from dividing by 6 weeks, and subtract that from the current time. This results in the number of days until the next release. Add that to the current time to produce the next release date.

Retrieved from "https://wiki.allizom.org/index.php?title=Release_Management/Merge_Documentation&oldid=1191813"