660038 - Remove channel switching support

Status: RESOLVED FIXED

(Toolkit :: Application Update, defect)

Description

[Robert Strong (they/them - no direct email)]

There isn't much code specifically for channel switching and it should be simple to remove.

Comment 1

[Robert Strong (they/them - no direct email)]

Attachment: app update patch

Comment 2

[Robert Strong (they/them - no direct email)]

Attachment: releng mar creation patch

Comment 3

[Robert Strong (they/them - no direct email)]

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.

Comment 4

[Robert Strong (they/them - no direct email)]

Attachment: releng mar creation patch v2

Comment 5

[Robert Strong (they/them - no direct email)]

Attachment: releng mar creation patch v3

Comment 6

[Robert Strong (they/them - no direct email)]

Attachment: updated client side patch v3

Comment 7

[Brian R. Bondy [:bbondy]]

> updated client side patch v3

Is this patch ready for review?

Comment 8

[Robert Strong (they/them - no direct email)]

I need to update it for a couple of the recent changes and verify that all tests pass first.

Comment 9

[Robert Strong (they/them - no direct email)]

Attachment: client side patch v4

Should be good to go. I am pushing to try just to make sure the service tests pass before landing.

Comment 10

[Robert Strong (they/them - no direct email)]

Comment on attachment 586531 [details] [diff] [review]
client side patch v4

meh... forgot to remove the update driver channel change code

Comment 11

[Robert Strong (they/them - no direct email)]

Attachment: client side patch v5

Comment 12

[Robert Strong (they/them - no direct email)]

Attachment: client side patch v6

Missed changes to two of the new tests in the previous patch

Comment 13

[Brian R. Bondy [:bbondy]]

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

Comment 14

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

Comment on attachment 535529 [details] [diff] [review]
releng mar creation patch v3

Looks fine to me.

Comment 15

[Robert Strong (they/them - no direct email)]

Attachment: client side patch v7

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

Comment 16

[Robert Strong (they/them - no direct email)]

Comment on attachment 589343 [details] [diff] [review]
client side patch v7

This fixed the test failures.
https://tbpl.mozilla.org/?tree=Try&rev=2541cae80e19

Comment 17

[Brian R. Bondy [:bbondy]]

Passed on elm as well by the way:
https://tbpl.mozilla.org/?tree=Elm&rev=444899ddcc96

Comment 18

[Brian R. Bondy [:bbondy]]

Code changes look good, I am going to try an update on elm first though before marking as r+.

Comment 19

[Mozilla RelEng Bot]

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/[e-mail]-2541cae80e19
 Timed out after 06 hours without completing.

Comment 20

[Brian R. Bondy [:bbondy]]

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.

Comment 21

[Robert Strong (they/them - no direct email)]

Pushed to fx-team

client side patch
https://hg.mozilla.org/integration/fx-team/rev/2175dcb4ca0b

releng patch
https://hg.mozilla.org/integration/fx-team/rev/e527c2b55f5c

Comment 22

[Tim Taubert [:ttaubert] (inactive)]

https://hg.mozilla.org/mozilla-central/rev/e527c2b55f5c
https://hg.mozilla.org/mozilla-central/rev/2175dcb4ca0b