1659682 - [flatpak] RC flatpak not properly updating beta users

Status: NEW

(Release Engineering :: Release Automation: Other, defect)

Description

[Mihai Tabara [:mtabara]⌚️GMT]

:jcristau pointed out something that seems fishy in our automation.

$ flatpak remote-info flathub-beta org.mozilla.firefox
error: Multiple branches available for org.mozilla.firefox, you must specify one of: org.mozilla.firefox//beta, org.mozilla.firefox//master, org.mozilla.firefox//stable

$ flatpak remote-info flathub-beta org.mozilla.firefox//beta
        ID: org.mozilla.firefox
       Ref: app/org.mozilla.firefox/x86_64/beta
      Arch: x86_64
    Branch: beta
Collection: org.flathub.Beta
  Download: 79.7 MB
 Installed: 217.4 MB
   Runtime: org.freedesktop.Platform/x86_64/19.08
       Sdk: org.freedesktop.Sdk/x86_64/19.08

    Commit: b63a7540a03ac21ff57fac6ad671d813b4894ff6b573f02a71cd677fbbb9e816
    Parent: 4321062c32e40db1f108806e6766540665cb35f12175fdfd6f6a5e2a3098ad95
   Subject: Export org.mozilla.firefox
      Date: 2020-08-14 03:06:52 +0000
$ flatpak remote-info flathub-beta org.mozilla.firefox//master
         ID: org.mozilla.firefox
        Ref: app/org.mozilla.firefox/x86_64/master
       Arch: x86_64
     Branch: master
 Collection: org.flathub.Beta
   Download: 79.2 MB
  Installed: 212.3 MB
    Runtime: org.freedesktop.Platform/x86_64/19.08
        Sdk: org.freedesktop.Sdk/x86_64/19.08

     Commit: 2f0a77fcef7316679ad0a4e171a1f62c2dd4e0914cca9a848994171d1985146d
     Parent: f0a6258fdae5656813e2fe764dd09556dc4657b49624f8535bd9503bfadd64be
End-of-life: The master branch of org.mozilla.firefox has been deprecated. Please install org.mozilla.firefox//beta instead.
    Subject: Export org.mozilla.firefox
       Date: 2020-03-09 15:24:31 +0000
$ flatpak remote-info flathub-beta org.mozilla.firefox//stable
        ID: org.mozilla.firefox
       Ref: app/org.mozilla.firefox/x86_64/stable
      Arch: x86_64
    Branch: stable
Collection: org.flathub.Beta
  Download: 79.7 MB
 Installed: 217.3 MB
   Runtime: org.freedesktop.Platform/x86_64/19.08
       Sdk: org.freedesktop.Sdk/x86_64/19.08

    Commit: 066b495a1287d92114b04f660b6a41ed73d851e160d897843dc560f55b09ecc9
    Parent: ae14c6240802b5d61db586bb4c0e6ad39b9f7c121e6fa795cadf59ae616efb13
   Subject: Export org.mozilla.firefox
      Date: 2020-08-18 00:05:20 +0000

The product listed looks like the following:

Name           Application ID             Version               Branch       Origin             Installation
Firefox        org.mozilla.firefox        80.0b8                beta         flathub-beta       system
Firefox        org.mozilla.firefox        80.0                  stable       flathub-beta       system

While the options given to install it are the following:

$ flatpak --user install flathub-beta org.mozilla.firefox
Looking for matches…
Similar refs found for ‘org.mozilla.firefox’ in remote ‘flathub-beta’ (user):

   1) app/org.mozilla.firefox/x86_64/beta
   2) app/org.mozilla.firefox/x86_64/master
   3) app/org.mozilla.firefox/x86_64/stable

Which do you want to use (0 to abort)? [0-3]: 

At first glance, that’s coming from https://hg.mozilla.org/mozilla-central/file/tip/taskcluster/docker/firefox-flatpak/runme.sh#l110 I think. FLATPAK_BRANCH is set here https://hg.mozilla.org/mozilla-central/file/tip/taskcluster/ci/release-flatpak-repackage/kind.yml#l51 so RC has it set for stable but then we publish it to beta here - https://hg.mozilla.org/mozilla-central/file/tip/taskcluster/ci/release-secondary-flatpak-push/kind.yml#l31 as far as I know, it doesn’t matter what we publish, as long as we update that in Flathub correctly, since that's like a git push operation.

So somehow both RC and regular betas are installed side by side, one showing up as one showing up as org.mozilla.firefox//beta and the other as org.mozilla.firefox//stable, but both from flathub beta repo.

Comment 1

[Mihai Tabara [:mtabara]⌚️GMT]

At first glance, my thoughts are that we need to hack the FLATPAK_BRANCH for RCs to be mozilla-beta instead so that we overwrite on top of existing regular betas.

Comment 2

[Mihai Tabara [:mtabara]⌚️GMT]

:jcristau - (not urgent) please remind me again, is bug 1623032 a dupe of this?

Comment 3

[Julien Cristau [:jcristau]]

I think they're different. Before 1623032, we didn't push the RCs to flathub-beta at all. Now we push them to flathub-beta as org.mozilla.firefox//stable. Maybe that should be org.mozilla.firefox//beta instead.