Closed Bug 964836 Opened 12 years ago Closed 12 years ago

Clean up MSN bundles and restore MSN add-on to the correct URL

Categories

(Release Engineering :: Release Requests, defect)

Product:
Release Engineering
Component:
Release Requests
Platform:
x86
macOS
Type:
defect
Priority:
Not set
Severity:
normal

Tracking

(Not tracked)

Status:
RESOLVED FIXED

People

(Reporter: mconnor, Assigned: bhearsum)

References

(
URL
)

Details

Attachments

(4 files, 2 obsolete files)

currently active links, and the configs that should be used
2.16 KB, text/plain
Details
use explicit mappings for partner symlinks
4.63 KB, patch
rail
: review+
mconnor
: feedback+
bhearsum
: checked-in+
Details | Diff | Splinter Review
bing.xpi
16.44 KB, application/x-xpinstall
Details
msn-us.xpi
16.79 KB, application/x-xpinstall
Details
Has a bit of a dependency on bug 964777 since we're producing a lot more than needed, and I'm untangling that. Also need to restore the add-on that should be at http://releases.mozilla.com/bundles/msn/us/addon/msn-us.xpi That needs an update, but I'll fix branding in bug 964801
I'm about to deactivate all other MSN builds in bug 964777, so we'll need to make sure that stage-tasks is updated to perform the right moves. Ben, is this enough info for you to move forward?
Flags: needinfo?(bhearsum)
Comment on attachment 8366962 [details] currently active links, and the configs that should be used I think so...I'll let you know if there's anything else. Thankfully, we have enough time to fix this before we ship.
Attachment #8366962 - Attachment is patch: false
Flags: needinfo?(bhearsum)
Assuming I interpreted the previous attachment correctly, this should work. Mike, can you have a look over these mappings to confirm that? Output from my test run (with run_remote_cmd tweaks + wrong username for safety): command: START command: ssh -l xrbld -i /home/cltbld/.ssh/xrbld_dsa stage.mozilla.org ls -l -f "/pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-australia/mac/en-US/Firefox\ 27.0.dmg" "/mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/mac/australia/Firefox\ Setup.dmg" command: cwd: /home/cltbld/tools/scripts/release command: output: /pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-australia/mac/en-US/Firefox 27.0.dmg /mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/mac/australia/Firefox Setup.dmg command: END (2.28s elapsed) command: START command: ssh -l xrbld -i /home/cltbld/.ssh/xrbld_dsa stage.mozilla.org ls -l -f "/pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-us/win32/en-US/Firefox\ Setup\ 27.0.exe" "/mnt/netapp/stage/releases.mozilla.com/bundles/bing/win32/en-US/Firefox-Bing\ Setup.exe" command: cwd: /home/cltbld/tools/scripts/release command: output: /pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-us/win32/en-US/Firefox Setup 27.0.exe /mnt/netapp/stage/releases.mozilla.com/bundles/bing/win32/en-US/Firefox-Bing Setup.exe command: END (2.21s elapsed) command: START command: ssh -l xrbld -i /home/cltbld/.ssh/xrbld_dsa stage.mozilla.org ls -l -f "/pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-fr/win32/fr/Firefox\ Setup\ 27.0.exe" "/mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/win32/fr/Firefox\ Setup.exe" command: cwd: /home/cltbld/tools/scripts/release command: output: /pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-fr/win32/fr/Firefox Setup 27.0.exe /mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/win32/fr/Firefox Setup.exe command: END (2.32s elapsed) command: START command: ssh -l xrbld -i /home/cltbld/.ssh/xrbld_dsa stage.mozilla.org ls -l -f "/pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-uk/win32/en-GB/Firefox\ Setup\ 27.0.exe" "/mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/win32/en-GB/Firefox\ Setup.exe" command: cwd: /home/cltbld/tools/scripts/release command: output: /pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-uk/win32/en-GB/Firefox Setup 27.0.exe /mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/win32/en-GB/Firefox Setup.exe command: END (2.30s elapsed) command: START command: ssh -l xrbld -i /home/cltbld/.ssh/xrbld_dsa stage.mozilla.org ls -l -f "/pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-de/win32/de/Firefox\ Setup\ 27.0.exe" "/mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/win32/de/Firefox\ Setup.exe" command: cwd: /home/cltbld/tools/scripts/release command: output: /pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-de/win32/de/Firefox Setup 27.0.exe /mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/win32/de/Firefox Setup.exe command: END (2.36s elapsed) command: START command: ssh -l xrbld -i /home/cltbld/.ssh/xrbld_dsa stage.mozilla.org ls -l -f "/pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-uk/mac/en-GB/Firefox\ 27.0.dmg" "/mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/mac/en-GB/Firefox\ Setup.dmg" command: cwd: /home/cltbld/tools/scripts/release command: output: /pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-uk/mac/en-GB/Firefox 27.0.dmg /mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/mac/en-GB/Firefox Setup.dmg command: END (2.19s elapsed) command: START command: ssh -l xrbld -i /home/cltbld/.ssh/xrbld_dsa stage.mozilla.org ls -l -f "/pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-ja/win32/ja/Firefox\ Setup\ 27.0.exe" "/mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/win32/ja/Firefox\ Setup.exe" command: cwd: /home/cltbld/tools/scripts/release command: output: /pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-ja/win32/ja/Firefox Setup 27.0.exe /mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/win32/ja/Firefox Setup.exe command: END (2.00s elapsed) command: START command: ssh -l xrbld -i /home/cltbld/.ssh/xrbld_dsa stage.mozilla.org ls -l -f "/pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-ja/mac/ja-JP-mac/Firefox\ 27.0.dmg" "/mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/mac/ja/Firefox\ Setup.dmg" command: cwd: /home/cltbld/tools/scripts/release command: output: /pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-ja/mac/ja-JP-mac/Firefox 27.0.dmg /mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/mac/ja/Firefox Setup.dmg command: END (1.74s elapsed) command: START command: ssh -l xrbld -i /home/cltbld/.ssh/xrbld_dsa stage.mozilla.org ls -l -f "/pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-australia/win32/en-US/Firefox\ Setup\ 27.0.exe" "/mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/win32/australia/Firefox\ Setup.exe" command: cwd: /home/cltbld/tools/scripts/release command: output: /pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-australia/win32/en-US/Firefox Setup 27.0.exe /mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/win32/australia/Firefox Setup.exe command: END (1.74s elapsed) command: START command: ssh -l xrbld -i /home/cltbld/.ssh/xrbld_dsa stage.mozilla.org ls -l -f "/pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-canada/mac/en-US/Firefox\ 27.0.dmg" "/mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/mac/canada/Firefox\ Setup.dmg" command: cwd: /home/cltbld/tools/scripts/release command: output: /pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-canada/mac/en-US/Firefox 27.0.dmg /mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/mac/canada/Firefox Setup.dmg command: END (1.31s elapsed) command: START command: ssh -l xrbld -i /home/cltbld/.ssh/xrbld_dsa stage.mozilla.org ls -l -f "/pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-canada/win32/en-US/Firefox\ Setup\ 27.0.exe" "/mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/win32/canada/Firefox\ Setup.exe" command: cwd: /home/cltbld/tools/scripts/release command: output: /pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-canada/win32/en-US/Firefox Setup 27.0.exe /mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/win32/canada/Firefox Setup.exe command: END (1.34s elapsed) command: START command: ssh -l xrbld -i /home/cltbld/.ssh/xrbld_dsa stage.mozilla.org ls -l -f "/pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-fr/mac/fr/Firefox\ 27.0.dmg" "/mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/mac/fr/Firefox\ Setup.dmg" command: cwd: /home/cltbld/tools/scripts/release command: output: /pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-fr/mac/fr/Firefox 27.0.dmg /mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/mac/fr/Firefox Setup.dmg command: END (1.62s elapsed) command: START command: ssh -l xrbld -i /home/cltbld/.ssh/xrbld_dsa stage.mozilla.org ls -l -f "/pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/bing/mac/en-US/Firefox\ 27.0.dmg" /mnt/netapp/stage/releases.mozilla.com/bundles/bing/mac/en-US/Firefox-Bing.dmg command: cwd: /home/cltbld/tools/scripts/release command: output: /pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/bing/mac/en-US/Firefox 27.0.dmg /mnt/netapp/stage/releases.mozilla.com/bundles/bing/mac/en-US/Firefox-Bing.dmg command: END (1.27s elapsed) command: START command: ssh -l xrbld -i /home/cltbld/.ssh/xrbld_dsa stage.mozilla.org ls -l -f "/pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-us/win32/en-US/Firefox\ Setup\ 27.0.exe" "/mnt/netapp/stage/releases.mozilla.com/bundles/msn/us/win32/en-US/Firefox\ Setup.exe" command: cwd: /home/cltbld/tools/scripts/release command: output: /pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-us/win32/en-US/Firefox Setup 27.0.exe /mnt/netapp/stage/releases.mozilla.com/bundles/msn/us/win32/en-US/Firefox Setup.exe command: END (1.24s elapsed) command: START command: ssh -l xrbld -i /home/cltbld/.ssh/xrbld_dsa stage.mozilla.org ls -l -f "/pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-de/mac/de/Firefox\ 27.0.dmg" "/mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/mac/de/Firefox\ Setup.dmg" command: cwd: /home/cltbld/tools/scripts/release command: output: /pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-de/mac/de/Firefox 27.0.dmg /mnt/netapp/stage/releases.mozilla.com/bundles/msn/international/mac/de/Firefox Setup.dmg command: END (1.28s elapsed) command: START command: ssh -l xrbld -i /home/cltbld/.ssh/xrbld_dsa stage.mozilla.org ls -l -f "/pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-us/mac/en-US/Firefox\ 27.0.dmg" "/mnt/netapp/stage/releases.mozilla.com/bundles/msn/us/mac/en-US/Firefox\ Setup.dmg" command: cwd: /home/cltbld/tools/scripts/release command: output: /pub/mozilla.org/firefox/candidates/27.0-candidates/build1/partner-repacks/msn-us/mac/en-US/Firefox 27.0.dmg /mnt/netapp/stage/releases.mozilla.com/bundles/msn/us/mac/en-US/Firefox Setup.dmg command: END (1.35s elapsed)
Assignee: nobody → bhearsum
Status: NEW → ASSIGNED
Attachment #8367325 - Flags: review?(rail)
Attachment #8367325 - Flags: feedback?(mconnor)
Component: Releases → Releases: Custom Builds
Comment on attachment 8367325 [details] [diff] [review] use explicit mappings for partner symlinks Looks good to me for mappings. Hooray hardcoding! This does mean that we should kill everything else that's not listed here, except for one link (XPI) that I'll attach manually once I've got the updates sorted.
Attachment #8367325 - Flags: feedback?(mconnor) → feedback+
(In reply to Mike Connor [:mconnor] from comment #5) > Comment on attachment 8367325 [details] [diff] [review] > use explicit mappings for partner symlinks > > Looks good to me for mappings. Hooray hardcoding! > > This does mean that we should kill everything else that's not listed here, > except for one link (XPI) that I'll attach manually once I've got the > updates sorted. Hmmm, didn't you already do that in https://hg.mozilla.org/build/partner-repacks/rev/d51bc5a7bb36?
I killed the configs, but we still have a bunch of builds on the FTP. Including a lot of dirs with fx 19 and 22 versions hanging out. Unless I missed something that nukes everything first, we'll need to manually clean up the directory.
Comment on attachment 8367325 [details] [diff] [review] use explicit mappings for partner symlinks Review of attachment 8367325 [details] [diff] [review]: ----------------------------------------------------------------- ::: scripts/release/stage-tasks.py @@ +53,5 @@ > +# Left side is destination relative to PARTNER_BUNDLE_DIR. > +# Right side is source, relative to partner-repacks in the candidates dir. > +PARTNER_BUNDLE_MAPPINGS = { > + 'msn/international/mac/australia/Firefox\ Setup.dmg': 'msn-australia/mac/en-US/Firefox\ %(version)s.dmg', > + 'msn/international/mac/canada/Firefox\ Setup.dmg': 'msn-canada/mac/en-US/Firefox\ %(version)s.dmg', just wrap the strings with r'' to make sure the backslashes are not lost.
Attachment #8367325 - Flags: review?(rail) → review+
Comment on attachment 8367325 [details] [diff] [review] use explicit mappings for partner symlinks Landed, and I moved the FIREFOX_27_0_RELEASE and _BUILD1 tags. I'll clean up the old stuff shortly.
Attachment #8367325 - Flags: checked-in+
Oops, forgot to change to raw strings, and I noticed that the bing win32 was going to use the msn-us repack. Fixed those in https://hg.mozilla.org/build/tools/rev/63711ce2feab
So, right now we've got the following directories: -bash-4.1$ pwd /mnt/netapp/stage/releases.mozilla.com/bundles -bash-4.1$ ls -1 bing msn msn-australia msn-canada msn-china msn-co msn-cr msn-de msn-en-MY msn-en-PH msn-en-SG msn-es msn-es-AR msn-es-CL msn-fi msn-fr msn-id msn-international msn-ja msn-latam msn-nl msn-pe msn-pt msn-sg-CN msn-th msn-uk msn-us msn-ve ripcurl I'm planning to fully delete all them except for "msn" and "bing". Inside of "msn" and "bing" I'm only going to keep the "Firefox Setup.exe" and "Firefox Setup.dmg" files that are listed in the csv - is that right? This means that I'll be removing a ton of versioned files (eg, msn/msn-international/mac/de/Firefox 19.0.dmg) as well as a tons of dirs that aren't listed at all (eg, msn/msn-es). Mike, can you confirm that before I go ahead and nuke them?
Flags: needinfo?(mconnor)
That's correct, based on what we have currently. If they've been using a link we don't know about, it'll be easy to resurrect that config and spin up new builds, so let's clear out everything we're not 100% sure on.
Flags: needinfo?(mconnor)
OK, cleanup is done. I checked all of the links, and they seem to still work.
Status: ASSIGNED → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
We didn't get the add-on Have an updated version we should copy into place, attaching in a second.
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Attached file msn-us.xpi (obsolete) —
The correct end point should be http://releases.mozilla.com/bundles/msn/us/addon/msn-us.xpi That's the last of it.
Attached file bing.xpi —
should be at /bundles/bing/addon/bing.xpi
Attachment #8369532 - Attachment is obsolete: true
Attached file msn-us.xpi (obsolete) —
Updated MSN XPI
Attachment #8370182 - Attachment is obsolete: true
Attached file msn-us.xpi —
Sigh.
I dropped the MSN and Bing packages into place. Mike and I talked on IRC and he tells me that the updates to these addons should be very infrequent, and not part of the regular 6 week cycle. Because of that, I've asked him to file specific bugs when they need updates, and someone will manually drop them into place.
Status: REOPENED → RESOLVED
Closed: 12 years ago → 12 years ago
Resolution: --- → FIXED
(In reply to Nick Thomas [:nthomas] from comment #21) > I've updated these docs > https://wiki.mozilla.org/index. > php?title=Releases%2FRelEngChecklist&diff=929342&oldid=926642 > https://wiki.mozilla.org/index. > php?title=Release%3ARelease_Automation_on_Mercurial%3AUpdates_through_Shippin > g&diff=929340&oldid=926946 > to remove the manual steps for MSN. Ben, could you review that change please > ? Looks right to me - thanks for that!
Flags: needinfo?(bhearsum)
Component: Custom Release Requests → Release Requests
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: