Releases/Firefox 3.6 MU Tests/BuildNotes
Contents
Release Engineers
Nick Thomas (nthomas)
Bugs
bug 515421 - tracking bug for 3.5.x to 3.6.y
bug 515417 - tracking bug for 3.0.z to 3.6.y
3.5.x to 3.6.y
Based on notes for 3.0.15 -> 3.5.5 MU (rather than 2.0.0.20 one), with more "improvements".
3.5.5 to 3.6b2
Create these config files
- CVS: mozilla/tools/patcher-configs/moz191-branch-major-update-patcher2.cfg
- HG: build/tools/release/updates/moz191-firefox-{linux,mac,win32}-major.cfg
Snippet Generation
On fx-linux-1.9-slave2:
mkdir -p /builds/3.6b2-major-update-tests cd /builds/3.6b2-major-update-tests/ export CVSROOT=:ext:cltbld@cvs.mozilla.org:/cvsroot cvs co -d patcher-configs mozilla/tools/patcher-configs ## get un-checked in configs curl -sL https://bugzilla.mozilla.org/attachment.cgi?id=413970 > patcher-configs/moz191-branch-major-update-patcher2.cfg ## end of configs get cvs co -r UPDATE_PACKAGING_R10 -d patcher mozilla/tools/patcher cd patcher cvs co -r UPDATE_PACKAGING_R10 -d MozBuild mozilla/tools/release/MozBuild # build tools ./patcher2.pl --build-tools --app=firefox --tools-rev=UPDATE_PACKAGING_R10 --config=../patcher-configs/moz191-branch-major-update-patcher2.cfg 2>&1 | tee ../firefox_build-tools.log # download mars ./patcher2.pl --download --app=firefox --config=../patcher-configs/moz191-branch-major-update-patcher2.cfg 2>&1 | tee ../firefox_download.log # FIXME - patcher needs to see that the MARs that it thinks are partials # are there or else it will not attempt to generate patchinfo cd temp/firefox mkdir 3.5.5-3.6b2 ln -s ../3.6b2/ftp 3.5.5-3.6b2/ftp # Also delete 3.5.5 mars that are only using up space rm -rf 3.5.5 cd ../.. # Create partial patches and snippets ./patcher2.pl --create-patches --app=firefox --config=../patcher-configs/moz191-branch-major-update-patcher2.cfg 2>&1 | tee ../firefox-create-patches.log
Quick Verify
Not really required when we're only going to push the test channels
Check that releasetest = beta = release. We know betatest should be different and point to ftp.m.o rather than the mirrors.
cd temp/firefox/3.5.5-3.6b2 # releasetest == beta find aus2.test -type d -iregex '.*/releasetest$' | perl -nle '$a = $_; $a =~ s/releasetest/beta/; $a =~ s/aus2\.test/aus2.beta/; system("diff -r -u $_ $a");' find aus2.beta -type d -iregex '.*/beta$' | perl -nle '$a = $_; $a =~ s/beta$/releasetest/; $a =~ s/aus2\.beta/aus2.test/; system("diff -r -u $_ $a");'
# beta == release find aus2.beta -type d -iregex '.*/beta$' | perl -nle '$a = $_; $a =~ s/aus2\.beta/aus2/; $a =~ s/beta/release/; system("diff -r -u $_ $a");' find aus2 -type d -iregex '.*/release$' | perl -nle '$a = $_; $a =~ s/release$/beta/; $a =~ s/aus2/aus2.beta/; system("diff -r -u $_ $a");'
Push to AUS
Only pushing test snippets over here (for production also copy aus2.beta and aus2)
rsync -e 'ssh -i /home/cltbld/.ssh/aus' -av aus2.test/ cltbld@aus2-staging.mozilla.org:/opt/aus2/snippets/staging/20091112-Firefox-3.5.5-3.6b2-MU-test
Enable test snippets
Leveraging an earlier backupsnip
# cltbld@aus2-staging ~/bin/pushsnip 20091112-Firefox-3.5.5-3.6b2-MU-test
Update verify
Ran update verify on fx-{linux,mac,win32}-1.9-slave2 as follows:
mkdir -p /builds/verify/firefox-355-36b2-major/ cd /builds/verify/firefox-355-36b2-major/ hg clone http://hg.mozilla.org/build/tools # get patch to trawl "Only in" directories cd tools/release/common # on mac & linux curl -sL https://bugzilla.mozilla.org/attachment.cgi?id=367544 | patch -p3 # on win32 wget --no-check-certificate -O patch https://bugzilla.mozilla.org/attachment.cgi?id=367544 patch -p3 < patch # everyone ... cd ../updates ## get un-checked in configs wget --no-check-certificate -O patch https://bug515421.bugzilla.mozilla.org/attachment.cgi?id=413972 patch -p3 < patch ## end of config get platform=linux # or mac or win32 ./verify.sh -c moz191-firefox-$platform-major.cfg 2>&1 | tee $platform.log
Update verify analysis
Linux output (no locale differences):
diff -r source/firefox/defaults/pref/channel-prefs.js target/firefox/defaults/pref/channel-prefs.js 1,2c1,2 < //@line 2 "/builds/slave/linux_build/build/browser/app/profile/channel-prefs.js" < pref("app.update.channel", "release"); --- > //@line 2 "/builds/moz2_slave/linux_build/build/browser/app/profile/channel-prefs.js" > pref("app.update.channel", "beta"); Only in source/firefox/icons: mozicon16.xpm Only in source/firefox/icons: mozicon50.xpm Only in source/firefox: old-homepage-default.properties Only in source/firefox/res: broken-image.gif Only in source/firefox/res: loading-image.gif
- channel-prefs.js is fine - comment change ignorable, channel change is expected
- the two xpm's were removed in bug 499226 but not added to removed-files.in
- old-homepage-default.properties was removed in bug 504953 but not added to removed-files.in
- the two gifs were converted to pngs in bug 420811 but added to a section of removed-files.in which is #ifdef XP_MACOSX
Mac output (no locale differences):
Only in source/Firefox.app/Contents/MacOS/components: oji.xpt diff -r source/Firefox.app/Contents/MacOS/defaults/pref/channel-prefs.js target/Firefox.app/Contents/MacOS/defaults/pref/channel-prefs.js 1,2c1,2 < //@line 2 "/builds/slave/macosx_build/build/browser/app/profile/channel-prefs.js" < pref("app.update.channel", "release"); --- > //@line 2 "/builds/moz2_slave/macosx_build/build/browser/app/profile/channel-prefs.js" > pref("app.update.channel", "beta"); Only in source/Firefox.app/Contents/MacOS: libwidget.rsrc Only in source/Firefox.app/Contents/MacOS: old-homepage-default.properties Only in source/Firefox.app/Contents: Plug-Ins Only in source/Firefox.app/Contents/Resources: firefox-bin.rsrc Contents of source/Firefox.app/Contents/Plug-Ins dir only in source or target 1687563284 0 drwxr-xr-x 3 cltbld cltbld 102 Nov 2 15:59 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin 1687563285 0 drwxr-xr-x 4 cltbld cltbld 136 Nov 12 15:24 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents 1687563286 0 drwxr-xr-x 2 cltbld cltbld 68 Nov 12 15:24 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents/MacOS 1687563287 0 drwxr-xr-x 3 cltbld cltbld 102 Nov 2 15:59 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents/Resources 1687563288 0 drwxr-xr-x 3 cltbld cltbld 102 Nov 12 15:24 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj 1687563289 0 drwxr-xr-x 2 cltbld cltbld 68 Nov 12 15:24 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib
- Contents/MacOS/components/oji.xpt - email out to ted and smichaud
- Contents/MacOS/libwidget.rsrc was removed by bug 464315 but not added to removed-files.in
- Contents/Resources/firefox-bin.rsrc was removed by bug 363747 but not added to removed-files.in
- Contents/Plug-Ins was removed by bug 520494, only empty dirs left
- channel-prefs.js and old-homepage-default.properties as for linux
Win32 (no locale differences):
Only in source/bin: .autoreg diff -r source/bin/defaults/pref/channel-prefs.js target/bin/defaults/pref/channel-prefs.js 2c2 < pref("app.update.channel", "release"); --- > pref("app.update.channel", "beta"); Binary files source/bin/freebl3.chk and target/bin/freebl3.chk differ Binary files source/bin/nssdbm3.chk and target/bin/nssdbm3.chk differ Only in source/bin: old-homepage-default.properties Only in source/bin: removed-files Only in source/bin/res: broken-image.gif Only in source/bin/res: loading-image.gif Binary files source/bin/softokn3.chk and target/bin/softokn3.chk differ
- .autoreg is normal on windows, as are the three chk'sand removed-files
- everything else as for linux
3.5.5 to 3.6b4
Create these config files
- CVS: mozilla/tools/patcher-configs/moz191-branch-major-update-patcher2.cfg
- HG: build/tools/release/updates/moz191-firefox-{linux,mac,win32}-major.cfg
Snippet Generation
On fx-linux-1.9-slave2. Abbreviated from the 3.6b2 run because we're reusing the same working dir.
cd /builds/3.6b2-major-update-tests/ ## get un-checked in configs curl -sL https://bugzilla.mozilla.org/attachment.cgi?id=414773 > patcher-configs/moz191-branch-major-update-patcher2.cfg ## end of configs get # clean up 3.6b2 mar files cd patcher rm -rf temp/firefox/3.6b2/ftp/* # download mars ./patcher2.pl --download --app=firefox --config=../patcher-configs/moz191-branch-major-update-patcher2.cfg 2>&1 | tee ../firefox_download.log # FIXME - patcher needs to see that the MARs that it thinks are partials # are there or else it will not attempt to generate patchinfo cd temp/firefox mkdir 3.5.5-3.6b4 ln -s ../3.6b4/ftp 3.5.5-3.6b4/ftp # Replace the 3.5.5 mars that are using up space with 1 byte files, # so we don't have to download them ever again (slow!!) cd 3.5.5/ftp for f in `ls *.*`; do echo > $f; done cd ../../../.. # Create partial patches and snippets ./patcher2.pl --create-patches --app=firefox --config=../patcher-configs/moz191-branch-major-update-patcher2.cfg 2>&1 | tee ../firefox-create-patches.log
Quick Verify
Not really required when we're only going to push the test channels
Check that releasetest = beta = release. We know betatest should be different and point to ftp.m.o rather than the mirrors.
cd temp/firefox/3.5.5-3.6b4 # releasetest == beta find aus2.test -type d -iregex '.*/releasetest$' | perl -nle '$a = $_; $a =~ s/releasetest/beta/; $a =~ s/aus2\.test/aus2.beta/; system("diff -r -u $_ $a");' find aus2.beta -type d -iregex '.*/beta$' | perl -nle '$a = $_; $a =~ s/beta$/releasetest/; $a =~ s/aus2\.beta/aus2.test/; system("diff -r -u $_ $a");' # beta == release find aus2.beta -type d -iregex '.*/beta$' | perl -nle '$a = $_; $a =~ s/aus2\.beta/aus2/; $a =~ s/beta/release/; system("diff -r -u $_ $a");' find aus2 -type d -iregex '.*/release$' | perl -nle '$a = $_; $a =~ s/release$/beta/; $a =~ s/aus2/aus2.beta/; system("diff -r -u $_ $a");'
Push to AUS
Only pushing test snippets over here (for production also copy aus2.beta and aus2)
rsync -e 'ssh -i /home/cltbld/.ssh/aus' -av aus2.test/ cltbld@aus2-staging.mozilla.org:/opt/aus2/snippets/staging/20091126-Firefox-3.5.5-3.6b4-MU-test
Enable test snippets
Leveraging an earlier backupsnip
# cltbld@aus2-staging ~/bin/pushsnip 20091126-Firefox-3.5.5-3.6b4-MU-test
Update verify
Ran update verify on fx-{linux,mac,win32}-1.9-slave2 as follows:
mkdir -p /builds/verify/firefox-355-36b4-major/ cd /builds/verify/firefox-355-36b4-major/ hg clone http://hg.mozilla.org/build/tools # get patch to trawl "Only in" directories cd tools/release/common # on mac & linux curl -sL https://bugzilla.mozilla.org/attachment.cgi?id=367544 | patch -p3 # on win32 wget --no-check-certificate -O patch https://bugzilla.mozilla.org/attachment.cgi?id=367544 patch -p3 < patch # everyone ... cd ../updates ## get un-checked in configs wget --no-check-certificate -O patch https://bug515421.bugzilla.mozilla.org/attachment.cgi?id=414770 patch -p3 < patch ## end of config get platform=linux # or mac or win32 ./verify.sh -c moz191-firefox-$platform-major.cfg 2>&1 | tee $platform.log
Update verify analysis
- No update found for es-MX, hr, ka, ku, mn, oc, sr because there's no a 3.6b4 build for those locales (only tested overlapping set of locales last time)
Linux output (all differences):
diff -r source/firefox/defaults/pref/channel-prefs.js target/firefox/defaults/pref/channel-prefs.js 1,2c1,2 < //@line 2 "/builds/slave/linux_build/build/browser/app/profile/channel-prefs.js" < pref("app.update.channel", "release"); --- > //@line 2 "/builds/moz2_slave/linux_build/build/browser/app/profile/channel-prefs.js" > pref("app.update.channel", "beta");
- which is expected
Mac output:
diff -r source/Firefox.app/Contents/MacOS/defaults/pref/channel-prefs.js target/Firefox.app/Contents/MacOS/defaults/pref/channel-prefs.js 2c2 < pref("app.update.channel", "release"); --- > pref("app.update.channel", "beta"); Only in source/Firefox.app/Contents: Plug-Ins Contents of source/Firefox.app/Contents/Plug-Ins dir only in source or target 1700435169 0 drwxr-xr-x 3 cltbld cltbld 102 Nov 2 15:59 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin 1700435170 0 drwxr-xr-x 4 cltbld cltbld 136 Nov 26 15:18 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents 1700435171 0 drwxr-xr-x 2 cltbld cltbld 68 Nov 26 15:18 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents/MacOS 1700435172 0 drwxr-xr-x 3 cltbld cltbld 102 Nov 2 15:59 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents/Resources 1700435173 0 drwxr-xr-x 3 cltbld cltbld 102 Nov 26 15:18 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj 1700435174 0 drwxr-xr-x 2 cltbld cltbld 68 Nov 26 15:18 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib
- channel-prefs.js and empty dirs
Win32 output:
Only in source/bin: .autoreg diff -r source/bin/defaults/pref/channel-prefs.js target/bin/defaults/pref/channel-prefs.js 2c2 < pref("app.update.channel", "release"); --- > pref("app.update.channel", "beta"); Binary files source/bin/freebl3.chk and target/bin/freebl3.chk differ Binary files source/bin/nssdbm3.chk and target/bin/nssdbm3.chk differ Only in source/bin: removed-files Binary files source/bin/softokn3.chk and target/bin/softokn3.chk differ
- .autoreg, removed/files and chk files all normal on Windows, channel-prefs.js as above
Locale specific differences (ml only, all platforms)
Only in source/Firefox.app/Contents/MacOS/searchplugins: yahoo-in.xml
- approved change to search plugins for Fx3.6 (bug 475016), and should be in 3.5.6 too. We leave old searchplugins behind anyway.
Move snippets to minortest
When the 3.5.6 release started it overwrote the betatest channel, so push the 3.5.5 -> 3.6b4 test into minortest instead.
# cltbld@aus2-staging cd /opt/aus2/snippets/staging/ rsync -a 20091126-Firefox-3.5.5-3.6b4-MU-test/ 20091202-Firefox-3.5.5-3.6b4-MU-minortest/ cd 20091202-Firefox-3.5.5-3.6b4-MU-minortest rm -rf Firefox/3.5.5/*/*/*/releasetest for d in `find . -mindepth 6 -maxdepth 6`; do mv $d ${d/betatest/minortest}; done ~/bin/pushsnip 20091202-Firefox-3.5.5-3.6b4-MU-minortest
3.5.7 to 3.6rc1
Create these config files
- CVS: mozilla/tools/patcher-configs/moz191-branch-major-update-patcher2.cfg
- HG: build/tools/release/updates/moz191-firefox-{linux,mac,win32}-major.cfg
Snippet Generation
On fx-linux-1.9-slave2. Reusing the same working dir as previous two times.
cd /builds/3.6b2-major-update-tests/ ## get un-checked in configs curl -sL https://bugzilla.mozilla.org/attachment.cgi?id=420677 > patcher-configs/moz191-branch-major-update-patcher2.cfg ## end of configs get # clean up old mar files cd patcher rm -rf temp/firefox/{3.6b4,3.5.5} # download mars ./patcher2.pl --download --app=firefox --config=../patcher-configs/moz191-branch-major-update-patcher2.cfg 2>&1 | tee ../firefox_download.log # FIXME - patcher needs to see that the MARs that it thinks are partials # are there or else it will not attempt to generate patchinfo cd temp/firefox mkdir 3.5.7-3.6rc1 ln -s ../3.6rc1/ftp 3.5.7-3.6rc1/ftp # Replace the 3.5.7 mars that are using up space with 1 byte files, # so we don't have to download them ever again (slow!!) cd 3.5.7/ftp for f in `ls *.*`; do echo > $f; done cd ../../../.. # Create partial patches and snippets ./patcher2.pl --create-patches --app=firefox --config=../patcher-configs/moz191-branch-major-update-patcher2.cfg 2>&1 | tee ../firefox-create-patches.log
Quick Verify
Not really required when we're only going to push the test channels
Check that releasetest = beta = release. We know betatest should be different and point to ftp.m.o rather than the mirrors.
cd temp/firefox/3.5.7-3.6rc1 # releasetest == beta find aus2.test -type d -iregex '.*/releasetest$' | perl -nle '$a = $_; $a =~ s/releasetest/beta/; $a =~ s/aus2\.test/aus2.beta/; system("diff -r -u $_ $a");' find aus2.beta -type d -iregex '.*/beta$' | perl -nle '$a = $_; $a =~ s/beta$/releasetest/; $a =~ s/aus2\.beta/aus2.test/; system("diff -r -u $_ $a");' # beta == release find aus2.beta -type d -iregex '.*/beta$' | perl -nle '$a = $_; $a =~ s/aus2\.beta/aus2/; $a =~ s/beta/release/; system("diff -r -u $_ $a");' find aus2 -type d -iregex '.*/release$' | perl -nle '$a = $_; $a =~ s/release$/beta/; $a =~ s/aus2/aus2.beta/; system("diff -r -u $_ $a");'
Push to AUS
Only pushing test snippets over here (for production also copy aus2.beta and aus2)
rsync -e 'ssh -i /home/cltbld/.ssh/aus' -av aus2.test/ cltbld@aus2-staging.mozilla.org:/opt/aus2/snippets/staging/20100107-Firefox-3.5.7-3.6rc1-MU-minortest
Enable test snippets
Leveraging an earlier backupsnip
# cltbld@aus2-staging ~/bin/pushsnip 20100107-Firefox-3.5.7-3.6rc1-MU-minortest
Update verify
Ran update verify on fx-{linux,mac,win32}-1.9-slave2 as follows:
mkdir -p /builds/verify/firefox-357-36rc1-major/ cd /builds/verify/firefox-357-36rc1-major/ hg clone http://hg.mozilla.org/build/tools # get patch to trawl "Only in" directories cd tools/release/common # on mac & linux curl -sL https://bugzilla.mozilla.org/attachment.cgi?id=367544 | patch -p3 # on win32 wget --no-check-certificate -O patch https://bugzilla.mozilla.org/attachment.cgi?id=367544 patch -p3 < patch # everyone ... cd ../updates ## get un-checked in configs wget --no-check-certificate -O patch https://bug515421.bugzilla.mozilla.org/attachment.cgi?id=420680 patch -p3 < patch ## end of config get platform=linux # or mac or win32 ./verify.sh -c moz191-firefox-$platform-major.cfg 2>&1 | tee $platform.log
Update verify analysis
- no update found for mn, which is not yet available for 3.6.x
- linux & mac: harmless comment change
diff -r source/firefox/defaults/pref/channel-prefs.js target/firefox/defaults/pref/channel-prefs.js 1c1 < //@line 2 "/builds/slave/linux_build/build/browser/app/profile/channel-prefs.js" --- > //@line 2 "/builds/moz2_slave/linux_build/build/browser/app/profile/channel-prefs.js"
- mac specific: leftover empty directories
Only in source/Firefox.app/Contents: Plug-Ins Contents of source/Firefox.app/Contents/Plug-Ins dir only in source or target 1743563413 0 drwxr-xr-x 3 cltbld cltbld 102 Dec 21 17:24 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin 1743563414 0 drwxr-xr-x 4 cltbld cltbld 136 Jan 7 20:46 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents 1743563415 0 drwxr-xr-x 2 cltbld cltbld 68 Jan 7 20:46 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents/MacOS 1743563416 0 drwxr-xr-x 3 cltbld cltbld 102 Dec 21 17:24 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents/Resources 1743563417 0 drwxr-xr-x 3 cltbld cltbld 102 Jan 7 20:46 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj 1743563418 0 drwxr-xr-x 2 cltbld cltbld 68 Jan 7 20:46 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib
- windows specific: .autoreg, removed-files and 3x .chk are all normal
Only in source/bin: .autoreg Binary files source/bin/freebl3.chk and target/bin/freebl3.chk differ Binary files source/bin/nssdbm3.chk and target/bin/nssdbm3.chk differ Only in source/bin: removed-files Binary files source/bin/softokn3.chk and target/bin/softokn3.chk differ
- locale specific: it - searchplugins/demauro.xml not removed, bug 532452 says that De Mauro is dead so perhaps it should be removed; comment left on bug, need to FOLLOWUP
demauro.xml is the only open issue.
Move snippets to majortest
Apparently it'll be a major update at first, so set that up for QA.
# cltbld@aus2-staging cd /opt/aus2/snippets/staging/ rsync -a 20100107-Firefox-3.5.7-3.6rc1-MU-minortest/ 20100108-Firefox-3.5.7-3.6rc1-MU-majortest/ cd 20100108-Firefox-3.5.7-3.6rc1-MU-majortest/ for f in `find . -type f`; do echo 'updateType=major' >> $f; done for d in `find . -mindepth 6 -maxdepth 6`; do mv $d ${d/minortest/majortest}; done ~/bin/pushsnip 20100108-Firefox-3.5.7-3.6rc1-MU-majortest/
3.5.7 to 3.6rc2
Create these config files
- CVS: mozilla/tools/patcher-configs/moz191-branch-major-update-patcher2.cfg
- HG: build/tools/release/updates/moz191-firefox-{linux,mac,win32}-major.cfg
Snippet Generation
On fx-linux-1.9-slave2. Reusing the same working dir as previous two times.
cd /builds/3.6b2-major-update-tests/ ## get un-checked in configs curl -sL https://bugzilla.mozilla.org/attachment.cgi?id=422134 > patcher-configs/moz191-branch-major-update-patcher2.cfg ## end of configs get # clean up old mar files cd patcher rm -rf temp/firefox/3.6rc1 # download mars ./patcher2.pl --download --app=firefox --config=../patcher-configs/moz191-branch-major-update-patcher2.cfg 2>&1 | tee ../firefox_download.log # FIXME - patcher needs to see that the MARs that it thinks are partials # are there or else it will not attempt to generate patchinfo cd temp/firefox mkdir 3.5.7-3.6rc2 ln -s ../3.6rc2/ftp 3.5.7-3.6rc2/ftp cd ../..
# Create partial patches and snippets ./patcher2.pl --create-patches --app=firefox --config=../patcher-configs/moz191-branch-major-update-patcher2.cfg 2>&1 | tee ../firefox-create-patches.log
Quick Verify
Not really required when we're only going to push the test channels
Check that releasetest = beta = release. We know betatest should be different and point to ftp.m.o rather than the mirrors.
cd temp/firefox/3.5.7-3.6rc2 # releasetest == beta find aus2.test -type d -iregex '.*/releasetest$' | perl -nle '$a = $_; $a =~ s/releasetest/beta/; $a =~ s/aus2\.test/aus2.beta/; system("diff -r -u $_ $a");' find aus2.beta -type d -iregex '.*/beta$' | perl -nle '$a = $_; $a =~ s/beta$/releasetest/; $a =~ s/aus2\.beta/aus2.test/; system("diff -r -u $_ $a");' # beta == release find aus2.beta -type d -iregex '.*/beta$' | perl -nle '$a = $_; $a =~ s/aus2\.beta/aus2/; $a =~ s/beta/release/; system("diff -r -u $_ $a");' find aus2 -type d -iregex '.*/release$' | perl -nle '$a = $_; $a =~ s/release$/beta/; $a =~ s/aus2/aus2.beta/; system("diff -r -u $_ $a");'
Push to AUS
Only pushing test snippets over here (for production also copy aus2.beta and aus2)
rsync -e 'ssh -i /home/cltbld/.ssh/aus' -av aus2.test/ cltbld@aus2-staging.mozilla.org:/opt/aus2/snippets/staging/20100117-Firefox-3.5.7-3.6rc2-MU-majortest
Enable test snippets
Leveraging an earlier backupsnip
# cltbld@aus2-staging ~/bin/pushsnip 20100117-Firefox-3.5.7-3.6rc2-MU-majortest
3.0.z to 3.6.y
3.0.15 to 3.6b2
Patch these config files
- CVS: mozilla/tools/patcher-configs/moz191-branch-major-update-patcher2.cfg
- HG: build/tools/release/updates/moz191-firefox-{linux,mac,win32}-major.cfg
Snippet Generation
Reuse the setup we have from 3.5.5 to 3.6b2.
On fx-linux-1.9-slave2:
## get un-checked in configs cd /builds/3.6b2-major-update-tests/patcher-configs curl -sL https://bugzilla.mozilla.org/attachment.cgi?id=413973 | patch -p0 ## end of configs get # FIXME - patcher needs to see that the MARs that it thinks are partials # are there or else it will not attempt to generate patchinfo cd temp/firefox mkdir 3.0.15-3.6b2 ln -s ../3.6b2/ftp 3.0.15-3.6b2/ftp cd ../.. # Create partial patches and snippets ./patcher2.pl --create-patches --app=firefox --config=../patcher-configs/moz19-branch-major-update-patcher2.cfg 2>&1 | tee ../firefox-create-patches.log
Quick Verify
Not really required when we're only going to push the test channels
Check that releasetest = beta = release. We know betatest should be different and point to ftp.m.o rather than the mirrors.
cd temp/firefox/3.0.15-3.6b2 # releasetest == beta find aus2.test -type d -iregex '.*/releasetest$' | perl -nle '$a = $_; $a =~ s/releasetest/beta/; $a =~ s/aus2\.test/aus2.beta/; system("diff -r -u $_ $a");' find aus2.beta -type d -iregex '.*/beta$' | perl -nle '$a = $_; $a =~ s/beta$/releasetest/; $a =~ s/aus2\.beta/aus2.test/; system("diff -r -u $_ $a");'
# beta == release find aus2.beta -type d -iregex '.*/beta$' | perl -nle '$a = $_; $a =~ s/aus2\.beta/aus2/; $a =~ s/beta/release/; system("diff -r -u $_ $a");' find aus2 -type d -iregex '.*/release$' | perl -nle '$a = $_; $a =~ s/release$/beta/; $a =~ s/aus2/aus2.beta/; system("diff -r -u $_ $a");'
Push to AUS
Only pushing test snippets over here (for production also copy aus2.beta and aus2)
rsync -e 'ssh -i /home/cltbld/.ssh/aus' -av aus2.test/ cltbld@aus2-staging.mozilla.org:/opt/aus2/snippets/staging/20091112-Firefox-3.0.15-3.6b2-MU-test
Enable test snippets
Leveraging an earlier backupsnip
# cltbld@aus2-staging ~/bin/pushsnip 20091112-Firefox-3.0.15-3.6b2-MU-test
Update verify
Ran update verify on fx-{linux,mac,win32}-1.9-slave2 as follows:
mkdir -p /builds/verify/firefox-3015-36b2-major/ cd /builds/verify/firefox-3015-36b2-major/ hg clone http://hg.mozilla.org/build/tools # get patch to trawl "Only in" directories cd tools/release/common # on mac & linux curl -sL https://bugzilla.mozilla.org/attachment.cgi?id=367544 | patch -p3 # on win32 wget --no-check-certificate -O patch https://bugzilla.mozilla.org/attachment.cgi?id=367544 patch -p3 < patch # everyone ... cd ../updates ## get un-checked in configs wget --no-check-certificate -O patch https://bug515417.bugzilla.mozilla.org/attachment.cgi?id=413974 patch -p3 < patch ## end of config get platform=linux # or mac or win32 ./verify.sh -c moz19-firefox-$platform-major.cfg 2>&1 | tee $platform.log
Update verify analysis
The simple combination of the 3.5.5 -> 3.6b2 results with the 3.0.15 -> 3.5.5 ones.
3.0.15 to 3.6b4
Patch these config files
- CVS: mozilla/tools/patcher-configs/moz191-branch-major-update-patcher2.cfg
- HG: build/tools/release/updates/moz191-firefox-{linux,mac,win32}-major.cfg
Snippet Generation
On fx-linux-1.9-slave2:
## get un-checked in configs cd /builds/3.6b2-major-update-tests/patcher-configs cvs up -C moz19-branch-major-update-patcher2.cfg curl -sL https://bugzilla.mozilla.org/attachment.cgi?id=414774 | patch -p0 ## end of configs get # FIXME - patcher needs to see that the MARs that it thinks are partials # are there or else it will not attempt to generate patchinfo cd ../patcher/temp/firefox mkdir 3.0.15-3.6b4 ln -s ../3.6b4/ftp 3.0.15-3.6b4/ftp cd ../.. # Create partial patches and snippets ./patcher2.pl --create-patches --app=firefox --config=../patcher-configs/moz19-branch-major-update-patcher2.cfg 2>&1 | tee ../firefox-create-patches.log
Quick Verify
Not really required when we're only going to push the test channels
Check that releasetest = beta = release. We know betatest should be different and point to ftp.m.o rather than the mirrors.
cd temp/firefox/3.0.15-3.6b4 # releasetest == beta find aus2.test -type d -iregex '.*/releasetest$' | perl -nle '$a = $_; $a =~ s/releasetest/beta/; $a =~ s/aus2\.test/aus2.beta/; system("diff -r -u $_ $a");' find aus2.beta -type d -iregex '.*/beta$' | perl -nle '$a = $_; $a =~ s/beta$/releasetest/; $a =~ s/aus2\.beta/aus2.test/; system("diff -r -u $_ $a");' # beta == release find aus2.beta -type d -iregex '.*/beta$' | perl -nle '$a = $_; $a =~ s/aus2\.beta/aus2/; $a =~ s/beta/release/; system("diff -r -u $_ $a");' find aus2 -type d -iregex '.*/release$' | perl -nle '$a = $_; $a =~ s/release$/beta/; $a =~ s/aus2/aus2.beta/; system("diff -r -u $_ $a");'
Push to AUS
Only pushing test snippets over here (for production also copy aus2.beta and aus2)
rsync -e 'ssh -i /home/cltbld/.ssh/aus' -av aus2.test/ cltbld@aus2-staging.mozilla.org:/opt/aus2/snippets/staging/20091126-Firefox-3.0.15-3.6b4-MU-test
Enable test snippets
Leveraging an earlier backupsnip
# cltbld@aus2-staging ~/bin/pushsnip 20091126-Firefox-3.0.15-3.6b4-MU-test
Update verify
Ran update verify on fx-{linux,mac,win32}-1.9-slave2 as follows:
mkdir -p /builds/verify/firefox-3015-36b4-major/ cd /builds/verify/firefox-3015-36b4-major/ hg clone http://hg.mozilla.org/build/tools # get patch to trawl "Only in" directories cd tools/release/common # on mac & linux curl -sL https://bugzilla.mozilla.org/attachment.cgi?id=367544 | patch -p3 # on win32 wget --no-check-certificate -O patch https://bugzilla.mozilla.org/attachment.cgi?id=367544 patch -p3 < patch # everyone ... cd ../updates ## get un-checked in configs wget --no-check-certificate -O patch https://bug515417.bugzilla.mozilla.org/attachment.cgi?id=414776 patch -p3 < patch ## end of config get platform=linux # or mac or win32 ./verify.sh -c moz19-firefox-$platform-major.cfg 2>&1 | tee $platform.log
Update verify analysis
- Locales ka, ku, mn, oc, sr give spurious results as there is no 3.6b2 build but we have the 3.5.5 leftover on betatest. eg, on linux:
Using https://aus2.mozilla.org/update/1/Firefox/3.0.15/2009101600/Linux_x86-gcc3/ka/betatest/update.xml?force=1 17:58:02 URL:http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.5.5-candidates/build1/update/linux-i686/ka/firefox-3.5.5.complete.mar [10014404/10014404] -> "update/partial.mar" [1] 17:58:04 URL:http://stage.mozilla.org/pub/mozilla.org//firefox/nightly/3.0.15-candidates/build3/firefox-3.0.15.ka.linux-i686.tar.bz2 [8958684/8958684] -> "firefox-3.0.15.ka.linux-i686.tar.bz2" [1] http://stage.mozilla.org/pub/mozilla.org//firefox/nightly/3.6b4-candidates/build1/linux-i686/ka/firefox-3.6b4.tar.bz2: 17:58:04 ERROR 404: Not Found. FAIL: Could not download source firefox-3.6b4.tar.bz2 from http://stage.mozilla.org/pub/mozilla.org//firefox/nightly/3.6b4-candidates/build1/linux-i686/ka/firefox-3.6b4.tar.bz2 skipping.. tar: ../downloads/firefox-3.6b4.tar.bz2: Cannot open: No such file or directory tar: Error is not recoverable: exiting now tar: Child returned status 2 tar: Error exit delayed from previous errors ... [3.0.15 build gets updated] ... succeeded calling QuitProgressUI diff: target/firefox: No such file or directory FAIL: unknown error from diff: 2
Mac is particularly scary as it tries to rsync /*. Didn't hit this for 3.6b2 because the update verify config only had the locales available for 3.0.15 and 3.6b2, rather than all the 3.0.15 locales we're using here. We can ignore these errors and fix the verify code to handle this properly (bug 531333).
Otherwise, the results are the simple combination of the 3.5.5 -> 3.6b2 results with the 3.0.15 -> 3.5.5 ones.
# cltbld@aus2-staging cd /opt/aus2/snippets/staging/ rsync -a 20091126-Firefox-3.0.15-3.6b4-MU-test/ 20091202-Firefox-3.0.15-3.6b4-MU-majortest/ cd 20091202-Firefox-3.0.15-3.6b4-MU-majortest rm -rf Firefox/3.0.15/*/*/*/releasetest for d in `find . -mindepth 6 -maxdepth 6`; do mv $d ${d/betatest/majortest}; done ~/bin/pushsnip 20091202-Firefox-3.0.15-3.6b4-MU-majortest
3.0.17 to 3.6rc1
Patch these config files
- CVS: mozilla/tools/patcher-configs/moz191-branch-major-update-patcher2.cfg
- HG: build/tools/release/updates/moz191-firefox-{linux,mac,win32}-major.cfg
Snippet Generation
On fx-linux-1.9-slave2:
## get un-checked in configs cd /builds/3.6b2-major-update-tests/patcher-configs cvs up -C moz19-branch-major-update-patcher2.cfg curl -sL https://bugzilla.mozilla.org/attachment.cgi?id=420694 | patch -p0 ## end of configs get # FIXME - patcher needs to see that the MARs that it thinks are partials # are there or else it will not attempt to generate patchinfo cd ../patcher/temp/firefox mkdir 3.0.17-3.6rc1 ln -s ../3.6rc1/ftp 3.0.17-3.6rc1/ftp cd ../.. # Create partial patches and snippets ./patcher2.pl --create-patches --app=firefox --config=../patcher-configs/moz19-branch-major-update-patcher2.cfg 2>&1 | tee ../firefox-create-patches.log
Quick Verify
Not really required when we're only going to push the test channels so skipped this (broken by only using majortest anyway)
Check that releasetest = beta = release. We know betatest should be different and point to ftp.m.o rather than the mirrors.
cd temp/firefox/3.0.17-3.6rc1 # releasetest == beta find aus2.test -type d -iregex '.*/releasetest$' | perl -nle '$a = $_; $a =~ s/releasetest/beta/; $a =~ s/aus2\.test/aus2.beta/; system("diff -r -u $_ $a");' find aus2.beta -type d -iregex '.*/beta$' | perl -nle '$a = $_; $a =~ s/beta$/releasetest/; $a =~ s/aus2\.beta/aus2.test/; system("diff -r -u $_ $a");' # beta == release find aus2.beta -type d -iregex '.*/beta$' | perl -nle '$a = $_; $a =~ s/aus2\.beta/aus2/; $a =~ s/beta/release/; system("diff -r -u $_ $a");' find aus2 -type d -iregex '.*/release$' | perl -nle '$a = $_; $a =~ s/release$/beta/; $a =~ s/aus2/aus2.beta/; system("diff -r -u $_ $a");'
Push to AUS
Only pushing test snippets over here (for production also copy aus2.beta and aus2)
rsync -e 'ssh -i /home/cltbld/.ssh/aus' -av aus2.test/ cltbld@aus2-staging.mozilla.org:/opt/aus2/snippets/staging/20100107-Firefox-3.0.17-3.6rc1-MU-majortest
Enable test snippets
Leveraging an earlier backupsnip
# cltbld@aus2-staging ~/bin/pushsnip 20100107-Firefox-3.0.17-3.6rc1-MU-majortest
Update verify
Ran update verify on fx-{linux,mac,win32}-1.9-slave2 as follows:
mkdir -p /builds/verify/firefox-3017-36rc1-major/ cd /builds/verify/firefox-3017-36rc1-major/ hg clone http://hg.mozilla.org/build/tools # get patch to trawl "Only in" directories cd tools/release/common # on mac & linux curl -sL https://bugzilla.mozilla.org/attachment.cgi?id=367544 | patch -p3 # on win32 wget --no-check-certificate -O patch https://bugzilla.mozilla.org/attachment.cgi?id=367544 patch -p3 < patch # everyone ... cd ../updates ## get un-checked in configs wget --no-check-certificate -O patch https://bug515417.bugzilla.mozilla.org/attachment.cgi?id=420698 patch -p3 < patch ## end of config get platform=linux # or mac or win32 ./verify.sh -c moz19-firefox-$platform-major.cfg 2>&1 | tee $platform.log
Update verify analysis
- no update found for mn, which is not yet available for 3.6.x
- Win32:
Only in source/bin: .autoreg diff -r source/bin/defaults/pref/channel-prefs.js target/bin/defaults/pref/channel-prefs.js 1c1 < //@line 2 "e:\fx19rel\WINNT_5.2_Depend\mozilla\browser\app\profile\channel-prefs.js" --- > //@line 2 "e:\builds\moz2_slave\win32_build\build\browser\app\profile\channel-prefs.js" Binary files source/bin/freebl3.chk and target/bin/freebl3.chk differ Binary files source/bin/nssdbm3.chk and target/bin/nssdbm3.chk differ Only in source/bin: removed-files Binary files source/bin/softokn3.chk and target/bin/softokn3.chk differ
- Linux:
diff -r source/firefox/defaults/pref/channel-prefs.js target/firefox/defaults/pref/channel-prefs.js 1c1 < //@line 2 "/builds/tinderbox/Fx-Mozilla1.9-Release/Linux_2.6.18-53.1.13.el5_Depend/mozilla/browser/app/profile/channel-prefs.js" --- > //@line 2 "/builds/moz2_slave/linux_build/build/browser/app/profile/channel-prefs.js"
- Mac:
diff -r source/Firefox.app/Contents/MacOS/defaults/pref/channel-prefs.js target/Firefox.app/Contents/MacOS/defaults/pref/channel-prefs.js 1c1 < //@line 2 "/builds/tinderbox/Fx-Mozilla1.9-Release/Darwin_8.8.4_Depend/mozilla/browser/app/profile/channel-prefs.js" --- > //@line 2 "/builds/slave/macosx_build/build/browser/app/profile/channel-prefs.js" Only in source/Firefox.app/Contents/MacOS/plugins: Default Plugin.plugin Only in source/Firefox.app/Contents/MacOS/res/cursors: CVS Only in source/Firefox.app/Contents: Plug-Ins Contents of source/Firefox.app/Contents/MacOS/plugins/Default Plugin.plugin dir only in source or target 1743784152 0 drwxr-xr-x 4 cltbld cltbld 136 Jan 8 00:41 source/Firefox.app/Contents/MacOS/plugins/Default Plugin.plugin/Contents 1743784153 0 drwxr-xr-x 2 cltbld cltbld 68 Jan 8 00:41 source/Firefox.app/Contents/MacOS/plugins/Default Plugin.plugin/Contents/MacOS 1743784154 0 drwxr-xr-x 3 cltbld cltbld 102 Jan 8 00:41 source/Firefox.app/Contents/MacOS/plugins/Default Plugin.plugin/Contents/Resources 1743784156 0 drwxr-xr-x 2 cltbld cltbld 68 Jan 8 00:41 source/Firefox.app/Contents/MacOS/plugins/Default Plugin.plugin/Contents/Resources/English.lproj Contents of source/Firefox.app/Contents/MacOS/res/cursors/CVS dir only in source or target Contents of source/Firefox.app/Contents/Plug-Ins dir only in source or target 1743784185 0 drwxr-xr-x 3 cltbld cltbld 102 Dec 21 16:41 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin 1743784186 0 drwxr-xr-x 4 cltbld cltbld 136 Jan 8 00:41 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents 1743784187 0 drwxr-xr-x 2 cltbld cltbld 68 Jan 8 00:41 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents/MacOS 1743784188 0 drwxr-xr-x 3 cltbld cltbld 102 Dec 21 16:41 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents/Resources 1743784189 0 drwxr-xr-x 3 cltbld cltbld 102 Jan 8 00:41 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj 1743784190 0 drwxr-xr-x 2 cltbld cltbld 68 Jan 8 00:41 source/Firefox.app/Contents/Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib
- Locale specific differences:
fr: Only in source/bin/searchplugins: MediaDICO-fr.xml hu: Only in source/bin/searchplugins: amazondotcom.xml Only in source/bin/searchplugins: answers.xml Only in source/bin/searchplugins: eBay.xml Only in source/bin/searchplugins: yahoo.xml it: Only in source/bin/searchplugins: demauro.xml uk: Only in source/bin/searchplugins: price-ua.xml
So that's just the combination of 3.5.7 -> 3.6rc1 with 3.0.15 -> 3.5.5.
3.0.17 to 3.6rc2
Patch these config files
- CVS: mozilla/tools/patcher-configs/moz191-branch-major-update-patcher2.cfg
- HG: build/tools/release/updates/moz191-firefox-{linux,mac,win32}-major.cfg
Snippet Generation
On fx-linux-1.9-slave2:
## get un-checked in configs cd /builds/3.6b2-major-update-tests/patcher-configs cvs up -C moz19-branch-major-update-patcher2.cfg curl -sL https://bugzilla.mozilla.org/attachment.cgi?id=422136 | patch -p0 ## end of configs get # FIXME - patcher needs to see that the MARs that it thinks are partials # are there or else it will not attempt to generate patchinfo cd ../patcher/temp/firefox mkdir 3.0.17-3.6rc2 ln -s ../3.6rc2/ftp 3.0.17-3.6rc2/ftp cd ../.. # Create partial patches and snippets ./patcher2.pl --create-patches --app=firefox --config=../patcher-configs/moz19-branch-major-update-patcher2.cfg 2>&1 | tee ../firefox-create-patches.log
Quick Verify
Not really required when we're only going to push the test channels so skipped this (broken by only using majortest anyway)
Check that releasetest = beta = release. We know betatest should be different and point to ftp.m.o rather than the mirrors.
cd temp/firefox/3.0.17-3.6rc2 # releasetest == beta find aus2.test -type d -iregex '.*/releasetest$' | perl -nle '$a = $_; $a =~ s/releasetest/beta/; $a =~ s/aus2\.test/aus2.beta/; system("diff -r -u $_ $a");' find aus2.beta -type d -iregex '.*/beta$' | perl -nle '$a = $_; $a =~ s/beta$/releasetest/; $a =~ s/aus2\.beta/aus2.test/; system("diff -r -u $_ $a");' # beta == release find aus2.beta -type d -iregex '.*/beta$' | perl -nle '$a = $_; $a =~ s/aus2\.beta/aus2/; $a =~ s/beta/release/; system("diff -r -u $_ $a");' find aus2 -type d -iregex '.*/release$' | perl -nle '$a = $_; $a =~ s/release$/beta/; $a =~ s/aus2/aus2.beta/; system("diff -r -u $_ $a");'
Push to AUS
Only pushing test snippets over here (for production also copy aus2.beta and aus2)
rsync -e 'ssh -i /home/cltbld/.ssh/aus' -av aus2.test/ cltbld@aus2-staging.mozilla.org:/opt/aus2/snippets/staging/20100117-Firefox-3.0.17-3.6rc2-MU-majortest
Enable test snippets
Leveraging an earlier backupsnip
# cltbld@aus2-staging ~/bin/pushsnip 20100117-Firefox-3.0.17-3.6rc2-MU-majortest