1110301 - Point en-US partner updates to 34.0

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Chris AtLee [:catlee]]

We need to generate partner-specific snippets so that users on en-US partner builds don't get served 34.0.5, but instead get 34.0.

Comment 1

[[e-mail] (:bhearsum)]

A combination of coop, catlee, me, mconnor, and kev all did the work here. The main part that needs documenting is the snippet generation. That was done ad-hoc, here's a rough record:
# ffxbld@aus3-staging
cd /opt/aus2/snippets/staging

# Generate test snippets, based on the 34.0 snippets that we shipped
# Make a copy first
rsync -av --include=Firefox --include=3*.0* --include=WINNT* --include=Linux* --include=Darwin* --include=2014* --include=en-US --include=*.txt --include=release --exclude=* /opt/aus2/snippets/pushed/Firefox-34.0-build2/ Firefox-partner-override-bug1110301-test/
cd Firefox-partner-override-bug1110301-test/
# Then copy the snippets to every partner channel
for i in `cat ~/partners.txt`; do find . -name release -exec rsync -av {}/ {}test-cck-$i \; ;done
# Remove the "release" channel snippets
find . -name release -exec rm -rf {} \;
# And remove 34.0build1 snippets, because nobody is using those partner builds
rm -rf Firefox/34.0

# Generate release-cck-* channel snippets, based on the test snippets from above (contents of the snippets are the same)
rsync -a Firefox-partner-override-bug1110301-test/ Firefox-partner-override-bug1110301/
cd Firefox-partner-override-bug1110301
# Rename the channel directories to release instead of releasetest
find . -name release* -exec rename releasetest release {} \;


After we had the channels in hand, the test snippets were pushed with "pushsnip". Then we did some testing by constructing URLs by hand (like https://aus3.mozilla.org/update/3/Firefox/30.0/20140605174243/WINNT_x86-msvc/en-US/releasetest-cck-aol/update.xml), and pointing actual partner builds at them. We had to set app.update.url.override to things like "https://aus3.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/releasetest-cck-aol/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml", because we can't override in defaults/pref/channel-prefs.js

We're still in the process of testing them at this time.

Comment 2

[[e-mail] (:bhearsum)]

Just in case I'm not around when we're ready to go live, the following needs to be run when we're ready:
# ffxbld@aus3-staging
cd /opt/aus2/snippets/staging/
~/bin/pushsnip Firefox-partner-override-bug1110301

Comment 3

[[e-mail] (:bhearsum)]

(In reply to Ben Hearsum [:bhearsum] from comment #1)
> A combination of coop, catlee, me, mconnor, and kev all did the work here.
> The main part that needs documenting is the snippet generation. That was
> done ad-hoc, here's a rough record:
> # ffxbld@aus3-staging
> cd /opt/aus2/snippets/staging
> 
> # Generate test snippets, based on the 34.0 snippets that we shipped
> # Make a copy first
> rsync -av --include=Firefox --include=3*.0* --include=WINNT*
> --include=Linux* --include=Darwin* --include=2014* --include=en-US
> --include=*.txt --include=release --exclude=*
> /opt/aus2/snippets/pushed/Firefox-34.0-build2/
> Firefox-partner-override-bug1110301-test/
> cd Firefox-partner-override-bug1110301-test/
> # Then copy the snippets to every partner channel
> for i in `cat ~/partners.txt`; do find . -name release -exec rsync -av {}/
> {}test-cck-$i \; ;done
> # Remove the "release" channel snippets
> find . -name release -exec rm -rf {} \;
> # And remove 34.0build1 snippets, because nobody is using those partner
> builds
> rm -rf Firefox/34.0
> 
> # Generate release-cck-* channel snippets, based on the test snippets from
> above (contents of the snippets are the same)
> rsync -a Firefox-partner-override-bug1110301-test/
> Firefox-partner-override-bug1110301/
> cd Firefox-partner-override-bug1110301
> # Rename the channel directories to release instead of releasetest
> find . -name release* -exec rename releasetest release {} \;
> 
> 
> After we had the channels in hand, the test snippets were pushed with
> "pushsnip". Then we did some testing by constructing URLs by hand (like
> https://aus3.mozilla.org/update/3/Firefox/30.0/20140605174243/WINNT_x86-msvc/
> en-US/releasetest-cck-aol/update.xml), and pointing actual partner builds at
> them. We had to set app.update.url.override to things like
> "https://aus3.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/
> %BUILD_TARGET%/%LOCALE%/releasetest-cck-aol/%OS_VERSION%/%DISTRIBUTION%/
> %DISTRIBUTION_VERSION%/update.xml", because we can't override in
> defaults/pref/channel-prefs.js
> 
> We're still in the process of testing them at this time.

Had to redo this because we missed 33.1 and 33.1.1. I did everything the same except the initial rsync used --include=3*, and I changed the test directory name so pushsnip wouldn't choke.

mconnor tested these, i pushed the live ones live.

Comment 4

[:Gavin Sharp [email: [e-mail]]]

This is FIXED, right?

Comment 5

[Chris AtLee [:catlee]]

yes!

Comment 6

[Nick Thomas [:nthomas] (UTC+12)]

While working on bug 1113222 I noticed there may be some issues with the channels used here. eg mail.com requests on release-cck-mail.com, while the snippets use release-cck-mailcom. This appears to come from using 'aus' in repack.cfg, which is out of sync with the value of app.partner.foo in distribution/distribution.ini.  The channel is constructed by 
 http://hg.mozilla.org/releases/mozilla-release/file/default/toolkit/modules/UpdateChannel.jsm#l31

Partner              app.partner channel        repack.cfg channel              Used
mail.com             release-cck-mail.com       release-cck-mailcom             release-cck-mailcom     **
mail.com_notb        release-cck-mail.com       release-cck-mailcom             release-cck-mailcom     **
ntt                  release-cck-nttresonant    release-cck-greengoo            release-cck-nttresonant
personas             release-cck-personas       release-cck-mozilla-personas    release-cck-personas
sony-en-CA           release-cck-sony           release-cck-sonyenca            release-cck-sonyenca    **
sony-en-US           release-cck-sony           release-cck-sonyus              release-cck-sonyus      **
yahoo-en-AU_keyword  release-cck-yahooauk       release-cck-yahooau             Both!
yahoo-en-HK          release-cck-yahoo          release-cck-yahoohk             Both!

We should fix up the windows snippets where there are issues (**). Mac will be getting no update via bug 1113222.

Comment 7

[Nick Thomas [:nthomas] (UTC+12)]

Bug 1113462 to add this to Balrog too.

Comment 8

[[e-mail] (:bhearsum)]

Mike, Gavin - should we revert this for 35.0? I know I asked before, but I only had bug 1113222 in my head at the time...

Comment 9

[Mike Connor [:mconnor]]

We should update normally to 35.0.

Comment 10

[[e-mail] (:bhearsum)]

Thanks Mike. That's been done now.