Closed Bug 660038 Opened 8 years ago Closed 8 years ago

Remove channel switching support

Categories

(Toolkit :: Application Update, defect)

defect
Not set

Tracking

()

RESOLVED FIXED
mozilla12

People

(Reporter: rstrong, Assigned: rstrong)

References

()

Details

Attachments

(2 files, 7 obsolete files)

There isn't much code specifically for channel switching and it should be simple to remove.
Attached patch app update patch (obsolete) — Splinter Review
Assignee: nobody → robert.bugzilla
Status: NEW → ASSIGNED
I'm leaving the mars as is for now since leaving the add-cc and remove-cc instructions tests that these changes leave the channel-prefs.js file alone.
Attached patch releng mar creation patch v2 (obsolete) — Splinter Review
Attachment #535526 - Attachment is obsolete: true
Depends on: 664967
Attached patch updated client side patch v3 (obsolete) — Splinter Review
Attachment #535525 - Attachment is obsolete: true
Attachment #586504 - Attachment description: updated client side patch → updated client side patch v3
> updated client side patch v3

Is this patch ready for review?
I need to update it for a couple of the recent changes and verify that all tests pass first.
Attached patch client side patch v4 (obsolete) — Splinter Review
Should be good to go. I am pushing to try just to make sure the service tests pass before landing.
Attachment #586504 - Attachment is obsolete: true
Attachment #586531 - Flags: review?(netzen)
Attachment #535529 - Flags: review?(nrthomas)
Comment on attachment 586531 [details] [diff] [review]
client side patch v4

meh... forgot to remove the update driver channel change code
Attachment #586531 - Flags: review?(netzen)
Attached patch client side patch v5 (obsolete) — Splinter Review
Attachment #586531 - Attachment is obsolete: true
Attachment #586566 - Flags: review?(netzen)
Attached patch client side patch v6 (obsolete) — Splinter Review
Missed changes to two of the new tests in the previous patch
Attachment #586566 - Attachment is obsolete: true
Attachment #586566 - Flags: review?(netzen)
Attachment #586599 - Flags: review?(netzen)
Comment on attachment 586599 [details] [diff] [review]
client side patch v6

Review of attachment 586599 [details] [diff] [review]:
-----------------------------------------------------------------

I pushed this to elm to try to run 2 consecutive Nightlies and make sure they can upgrade, but it's causing tests to fail on elm.
Please see here:
https://tbpl.mozilla.org/?tree=Elm

Also please let me know if you can reproduce it locally so I can back it out of Elm for the moment. I haven't tried locally.

::: toolkit/mozapps/update/nsUpdateService.js
@@ -643,5 @@
>  }
>  
> -function createChannelChangeFile(dir) {
> -  var channelChangeFile = dir.clone();
> -  channelChangeFile.append(FILE_CHANNELCHANGE);

FILE_CHANNELCHANGE is not being removed from this file but is no longer used. Please remove.
- const FILE_CHANNELCHANGE  = "channelchange";

Also please remove these comments:

- // If the user changes the update channel there can be leftover files from
- // a previous download so clean the updates directory for manual checks.
+ // For manual checks, if force is specified then clean the updates directory
Attachment #586599 - Flags: review?(netzen) → review-
Comment on attachment 535529 [details] [diff] [review]
releng mar creation patch v3

Looks fine to me.
Attachment #535529 - Flags: review?(nrthomas) → review+
Finally had a chance to look at what was going on... the new tests were relying on the channel change file and this should fix it. Running it through try
Attachment #586599 - Attachment is obsolete: true
Comment on attachment 589343 [details] [diff] [review]
client side patch v7

This fixed the test failures.
https://tbpl.mozilla.org/?tree=Try&rev=2541cae80e19
Attachment #589343 - Flags: review?(netzen)
Code changes look good, I am going to try an update on elm first though before marking as r+.
Try run for 2541cae80e19 is complete.
Detailed breakdown of the results available here:
    https://tbpl.mozilla.org/?tree=Try&rev=2541cae80e19
Results (out of 28 total builds):
    success: 26
    warnings: 2
Builds (or logs if builds failed) available at:
http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds/rstrong@mozilla.com-2541cae80e19
 Timed out after 06 hours without completing.
Comment on attachment 589343 [details] [diff] [review]
client side patch v7

Review of attachment 589343 [details] [diff] [review]:
-----------------------------------------------------------------

Looks good and an update worked on elm.
Attachment #589343 - Flags: review?(netzen) → review+
https://hg.mozilla.org/mozilla-central/rev/e527c2b55f5c
https://hg.mozilla.org/mozilla-central/rev/2175dcb4ca0b
Status: ASSIGNED → RESOLVED
Closed: 8 years ago
Resolution: --- → FIXED
Whiteboard: [fixed-in-fx-team]
Target Milestone: --- → mozilla12
You need to log in before you can comment on or make changes to this bug.