Release Management/Merge Documentation: Difference between revisions

Jump to navigation Jump to search

Release Management/Merge Documentation (view source)

Revision as of 18:06, 21 October 2013

1,049 bytes removed ,  21 October 2013
no edit summary
No edit summary
Line 120: Line 120:
=Merge Day (Central, Aurora, Beta)=
=Merge Day (Central, Aurora, Beta)=


Merge day helper script : https://gist.github.com/lsblakk/5568843 '''ALWAYS GET A FRESH COPY IN CASE THERE HAVE BEEN UPDATES!!!'''
Merge day helper script : https://gist.github.com/bbajaj/6577763 '''ALWAYS GET A FRESH COPY IN CASE THERE HAVE BEEN UPDATES!!!'''


== Check IIDs that need to be bumped ==
== Check IIDs that need to be bumped ==
Line 152: Line 152:
* 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).


== Clone the Helper Script (do this every merge day) ==
== Get Bhavana's Helper Script (do this every merge day) ==
  # Make sure you get a fresh copy in case there have been updates since last merge
  # Make sure you get a fresh copy in case there have been updates since last merge
  git clone https://gist.github.com/lsblakk/5568843
  git clone https://gist.github.com/bbajaj/6577763
ln -s 5568843/gistfile1.py merge_help.py


* Open two terminal windows, be in the top dir of your cloned repos in both
* Open two terminal windows, be in the top dir of your cloned repos in both
Line 165: Line 164:
==== Preparation and Tagging ====
==== Preparation and Tagging ====
* '''Send note to dev-planning and #developers announcing that the merge is about to start'''
* '''Send note to dev-planning and #developers announcing that the merge is about to start'''
  cd ~/Mozilla/mozilla-central
   
hg pull
* Script will do tagging of mozilla_central -> FIREFOX_AURORA_{{CENTRAL_VERSION}}_BASE
hg up
hg tag FIREFOX_AURORA_{{CENTRAL_VERSION}}_BASE
 
* Script will do version bumps
* Script will do version bumps


==== Verify & Commit Your Changes ====
==== Verify & Push Your Changes ====
  # check the diffs to ensure nothing additional has been changed
  # check the diffs to ensure nothing additional has been changed
hg diff
hg commit -m "Merging in version bump NO BUG"
hg out
  hg push
  hg push


Line 182: Line 175:


=== mozilla-aurora {{AURORA_VERSION}} to mozilla-beta uplift ===
=== mozilla-aurora {{AURORA_VERSION}} to mozilla-beta uplift ===
==== Tag mozilla-aurora ====
==== Review tagging of mozilla-aurora and push ====
# review
  cd ~/Mozilla/mozilla-aurora
  cd ~/Mozilla/mozilla-aurora
hg tag -m "Tagging for mozilla-aurora->mozilla-beta uplift CLOSED TREE DONTBUILD" FIREFOX_BETA_{{AURORA_VERSION}}_BASE
hg out
# review
  hg push
  hg push


==== Tagging and closing old beta ====
==== Review tagging of mozilla-beta and continue to push ====
  cd ~/mozilla/mozilla-beta
  cd ~/mozilla/mozilla-beta
hg tag -m "Tagging end of BETA{{BETA_VERSION}} CLOSED TREE DONTBUILD" FIREFOX_BETA_{{BETA_VERSION}}_END
hg commit --close-branch -m 'closing old head CLOSED TREE DONTBUILD'
hg out
  hg push
  hg push


==== Pull from Aurora into Beta ====
==== Verify the script Pulled from Aurora into Beta ====
  hg pull -u -r FIREFOX_BETA_{{AURORA_VERSION}}_BASE http://hg.mozilla.org/releases/mozilla-aurora
  hg pull -u -r FIREFOX_BETA_{{AURORA_VERSION}}_BASE http://hg.mozilla.org/releases/mozilla-aurora


* Script does version bumps
* Script does version bumps and branding changes
 
==== Verify & Commit version bumps changes ====
hg commit -m "Merging in version bumps NO BUG CLOSED TREE ba=release"
hg out


* Script does branding changes
==== Verify the Commits related to version bumps and branding changes ====
==== Verify & Commit branding changes ====
hg commit -m "Merging in branding changes NO BUG CLOSED TREE ba=release"
hg out


==== L10n data changes ====
==== L10n data changes ====
Line 230: Line 212:
** '''Make sure QA is aware (an email to r-d is best)'''
** '''Make sure QA is aware (an email to r-d is best)'''


==== Tagging and closing old aurora ====
 
==== Script will Tag and commit, continue to push ====
  cd ~/mozilla/mozilla-aurora
  cd ~/mozilla/mozilla-aurora
hg tag -m "Tagging for mozilla-central->mozilla-aurora uplift CLOSED TREE" FIREFOX_AURORA_{{AURORA_VERSION}}_END
hg commit --close-branch -m 'closing old head CLOSED TREE DONTBUILD'
hg out
  hg push
  hg push


==== Pull from m-c into Aurora ====
====Verify that script Pulled from m-c into Aurora ====
hg pull -u -r FIREFOX_AURORA_{{CENTRAL_VERSION}}_BASE http://hg.mozilla.org/mozilla-central


* Script will do version bumps
==== Verify the Diff/Commit of Version Bumps/Branding changes ====
==== Verify & Commit Version Bumps ====
  # check the diffs to ensure nothing additional has been changed
  # check the diffs to ensure nothing additional has been changed
hg diff
 
hg commit -m "Merging in version bump NO BUG CLOSED TREE"
hg out


* Script will do branding changes
* Script will disable profiling changes
==== Verify & Commit branding changes ====
hg commit -m "Merging in branding changes NO BUG CLOSED TREE ba=release"
hg out


* Script will disable profiling changes
==== Verify the Diff/Commit of profiling changes ====  
==== Verify & Commit profiling changes ====  
hg diff
hg commit -m "Disable profiling on Aurora NO BUG CLOSED TREE ba=release"
hg out


==== Verify & Commit mozconfig dtrace & instruments changes ====  
==== Verify the Diff/Commit of mozconfig dtrace & instruments changes (had trouble last time the change manually if needed)====
  hg diff
  hg diff
  hg commit -m "Remove dtrace & instruments in mozconfigs on Aurora as per bug 748669 CLOSED TREE ba=release"
  hg commit -m "Remove dtrace & instruments in mozconfigs on Aurora as per bug 748669 CLOSED TREE ba=release"
Bhavana
Confirmed users
976

edits

Retrieved from "https://wiki.allizom.org/Special:MobileDiff/734025"

Navigation menu