Release Management/Merge Documentation: Difference between revisions

Line 51: Line 51:
=== Uplift locales ===
=== Uplift locales ===
Helper script: [http://hg.mozilla.org/build/braindump/file/default/releases-related/beta2release_l10n.sh beta2release_l10n.sh]
Helper script: [http://hg.mozilla.org/build/braindump/file/default/releases-related/beta2release_l10n.sh beta2release_l10n.sh]
* The script uses <tt>~/.ssh/ffxbld_dsa</tt> key to push l10n repos. It can be run from cruncher.
== L10N sync ==
* 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]
 
== Re-Open Beta Tree ==
'''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)
* Announce completion of merge in #release-drivers (ping Standard8 and Callek)


Confirmed users
3,104

edits