Release Management/Merge Days/07-16-2012

From MozillaWiki
Jump to: navigation, search

Mozilla-Beta to Mozilla-Release (July 13, 2012)

VERSION=13
HG_USER="lsblakk <lsblakk@mozilla.com>"
beta_rev=$(hg -R mozilla-beta id -i -r default)
release_rev=$(hg -R mozilla-release id -i -r default)
date +%Y%m%d
RELEASE_BASE_TAG="RELEASE_BASE_20120713"
RELEASE_TAG="FIREFOX_RELEASE_$VERSION"
hg -R mozilla-beta tag -r $beta_rev -u "$HG_USER" -m "Added tag $RELEASE_BASE_TAG for changes
hg -R mozilla-beta push ssh://hg.mozilla.org/releases/mozilla-beta
hg -R mozilla-release tag -r $release_rev -u "$HG_USER" -m "Added tag $RELEASE_TAG for change
hg -R mozilla-release commit -u "$HG_USER" -m "Closing old head. CLOSED TREE a=release" --clo
hg -R mozilla-release pull mozilla-beta
hg -R mozilla-release up -C default
edit mozilla-release/browser/confvars.sh
hg -R mozilla-release diff
hg -R mozilla-release commit -u "$HG_USER" -m "Updating confvars.sh CLOSED TREE a=release"
edit mozilla-release/browser/locales/shipped-locales
edit mozilla-release/browser/locales/all-locales
hg -R mozilla-release commit -u "$HG_USER" -m "Updating shipped-locales, removing sw, mn from
hg -R mozilla-release push -f ssh://hg.mozilla.org/releases/mozilla-release

L10n Sync

  • didn't have any files in the mozilla-release/ff repo (de-beta'd for this release) -- need to mention this to Axel
  • ran l10n_sync.sh but there was a merge needed on 'nl' and it had a script error, no "" around $HG_USER and then it also crapped out without pushing, so did that manually:
hg push -f -e "ssh -l ffxbld -i ~/.ssh/ffxbld_dsa" ssh://hg.mozilla.org/releases/l10n/mozilla-release/nl

Migration Day: July 17, 2012

  • Sent 15 min notification email to dev.planning that migration will be starting and Aurora/Beta trees will close

Tagging Mozilla-Central & Version Bumps:

cd ../mozilla-central
hg pull && hg up -C
vim browser/config/version.txt
vim config/milestone.txt
vim js/src/config/milestone.txt
vim mobile/android/confvars.sh
vim mobile/xul/confvars.sh
vim b2g/confvars.sh
vim xpcom/components/Module.h
hg qnew -f mozilla-bumps
hg pull && hg up
hg tag FIREFOX_AURORA_16_BASE
hg qrefresh -m "Merging in version bump NO BUG"
hg qfinish -a
hg out
hg push ssh://hg.mozilla.org/mozilla-central
hg tag FIREFOX_AURORA_16_BASE (tagged the wrong changeset, so bumped it to 6fdf9985acfe)
hg push ssh://hg.mozilla.org/mozilla-central

Mozilla-Beta uplift

Trying to push to mozilla-beta, 'searching for changes' was taking an incredibly long amount of time so I killed the push and tried again, got:
pushing to ssh://hg.mozilla.org/releases/mozilla-beta
searching for changes
remote: waiting for lock on repository /repo/hg/mozilla/releases/mozilla-beta held by 'hgssh1.dmz.scl3.mozilla.com:20473'
remote: abort: repository /repo/hg/mozilla/releases/mozilla-beta: timed out waiting for lock held by hgssh1.dmz.scl3.mozilla.com:20473
abort: unexpected response: empty string
so I spoke with bkero in #infra and he killed the lock that I had from my initial push, but subsequent pushes still died on 'empty string' and I filed:
https://bugzilla.mozilla.org/show_bug.cgi?id=774391
cd ../mozilla-beta
hg tag -m "Tagging end of BETA14 CLOSED TREE" FIREFOX_BETA_14_END
hg commit --close-branch -m 'closing old head CLOSED TREE'
hg out
hg push ssh://hg.mozilla.org/releases/mozilla-beta
hg pull -u -r FIREFOX_BETA_15_BASE http://hg.mozilla.org/releases/mozilla-aurora
vim browser/config/version.txt
vim config/milestone.txt
vim js/src/config/milestone.txt
vim mobile/android/confvars.sh
vim mobile/xul/confvars.sh
hg diff
hg commit -m "Merging in version bump NO BUG CLOSED TREE"
hg out
vim browser/confvars.sh
vim mobile/android/config/mozconfigs/android/debug
vim mobile/android/config/mozconfigs/android/l10n-nightly
vim mobile/android/config/mozconfigs/android/nightly
vim mobile/xul/config/mozconfigs/android/debug
vim mobile/xul/config/mozconfigs/android/nightly
hg commit -m "Merging in branding changes NO BUG CLOSED TREE"
hg out
hg revert -r FIREFOX_BETA_14_END browser/locales/all-locales
hg revert -r FIREFOX_BETA_14_END mobile/android/locales/*-locales
hg diff
hg commit -m "Merging in l10n changes NO BUG CLOSED TREE"
vim .hg/hgrc
# CLOBBER mozilla-beta builders
# ping Standard8, Pike in #release-drivers
hg push -f real

Mozilla-Aurora uplift

cd ../mozilla-aurora
hg pull && hg up -C
hg tag -m "Tagging for mozilla-central->mozilla-aurora uplift CLOSED TREE" FIREFOX_AURORA_15_END
hg commit --close-branch -m 'closing old head CLOSED TREE'
hg out
hg push real
hg pull -u -r FIREFOX_AURORA_16_BASE http://hg.mozilla.org/mozilla-central
vim browser/config/version.txt
vim config/milestone.txt
vim js/src/config/milestone.txt
vim mobile/android/confvars.sh
vim mobile/xul/confvars.sh
hg diff
hg commit -m "Merging in version bump NO BUG CLOSED TREE"
hg out
vim browser/confvars.sh
vim mobile/android/config/mozconfigs/android/debug
vim mobile/android/config/mozconfigs/android/l10n-nightly
vim mobile/android/config/mozconfigs/android/nightly
vim mobile/xul/config/mozconfigs/android/debug
vim mobile/xul/config/mozconfigs/android/nightly
hg commit -m "Merging in branding changes NO BUG CLOSED TREE"
hg out
hg revert -r FIREFOX_AURORA_15_END browser/locales/*-locales
hg revert -r FIREFOX_AURORA_15_END mobile/android/locales/*-locales
hg diff
hg commit -m "Merging in l10n changes NO BUG CLOSED TREE"
hg out
# CLOBBER mozilla-aurora builders
# ping Standard8, Pike in #release-drivers
hg push -f real

Completion checklist

Now to go and do any needed backouts as well as to go over nominations for beta to see what is needed for Beta 1 go to build.