1622282 - [snap] added cleanup part to remove duplicate files

Status: RESOLVED FIXED

(Release Engineering :: Release Automation: Snap, enhancement)

Description

[Ken VanDine]

User Agent: Mozilla/5.0 (X11; Linux x86_64; rv:75.0) Gecko/20100101 Firefox/75.0

Steps to reproduce:

The current snap includes some files that are also provided by the base snap and the gnome-3-28-1804 content snap.

Comment 1

[Ken VanDine]

Attachment: Bug 1622282 - Find files provided by the base and platform snap and ensure they aren't duplicated in this snap r=jlorenzo

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/1a0776f93e88
Find files provided by the base and platform snap and ensure they aren't duplicated in this snap r=jlorenzo

Comment 3

[Arthur Iakab [arthur_iakab]]

https://hg.mozilla.org/mozilla-central/rev/1a0776f93e88

Comment 4

[Johan Lorenzo [:jlorenzo]]

Comment on attachment 9133208 [details]
Bug 1622282 - Find files provided by the base and platform snap and ensure they aren't duplicated in this snap r=jlorenzo

Beta/Release Uplift Approval Request

• User impact if declined: Unable to get official builds with this patch, because Snaps are only repackaged in mozilla-beta and above.
• Is this code covered by automated tests?: No
• Has the fix been verified in Nightly?: No
• Needs manual test from QE?: No
• If yes, steps to reproduce:
• List of other uplifts needed: None
• Risk to taking this patch: Low
• Why is the change risky/not risky? (and alternatives if risky): This patch is just cleaning up the Snap repackage which contained duplicated files. We're at the beginning of the beta cycle, backing it out in case something goes South is less risky at this stage.
• String changes made/needed: None

Comment 5

[Pascal Chevrel:pascalc (PTO until April 26)]

Comment on attachment 9133208 [details]
Bug 1622282 - Find files provided by the base and platform snap and ensure they aren't duplicated in this snap r=jlorenzo

That looks safe and reasonnable to me, uplift approved for 75 beta 6, thanks!

Comment 6

[Cristian Brindusan [:cbrindusan]]

https://hg.mozilla.org/releases/mozilla-beta/rev/83d94de1d967

Comment 7

[Johan Lorenzo [:jlorenzo]]

Crap, this patch broke the snap repackage task[1]:

Priming xdg-open 
Priming shared-mime-info 
Priming cleanup 
+ cd /snap/core18/current
+ find . -type f,l -exec rm -f /home/worker/workspace/prime/{} ;
+ cd /snap/gnome-3-28-1804/current
/bin/sh: 38: cd: can't cd to /snap/gnome-3-28-1804/current
Failed to run 'override-prime': Exit code was 2.

This could have been avoided with bug 1451694, for instance. That said, I also see a good opportunity to grant Ken level 1 access to try patches on our infra (bug 1623696). I confess I didn't have enough bandwidth get this running on our infra, and I thought the patch was low-risk enough. Moreover, Ken knows Snap inside out and he's been a great help to me in setting the Snap packages up.

[1] https://firefox-ci-tc.services.mozilla.com/tasks/PUYx2nfdRxegJzUh_QkcRA/runs/0/logs/https%3A%2F%2Ffirefox-ci-tc.services.mozilla.com%2Fapi%2Fqueue%2Fv1%2Ftask%2FPUYx2nfdRxegJzUh_QkcRA%2Fruns%2F0%2Fartifacts%2Fpublic%2Flogs%2Flive.log#L8170

Comment 8

[Cosmin Sabou [:CosminS]]

Backed out on autoland: https://hg.mozilla.org/integration/autoland/rev/414dba231f7f89576dae6727b91390d751cb90dc will be included in the next merge to m-c. Will back out from beta soon.

Comment 9

[Ken VanDine]

Attachment: Bug 1622282 - extract gnome-3-28-1804 platform snap to be used in the cleanup part r=jlorenzo

Comment 10

[Cosmin Sabou [:CosminS]]

Backed out from beta: https://hg.mozilla.org/releases/mozilla-beta/rev/94e14b150fcd52054d4d177871f46ee11a4f8e6e

Comment 11

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

Backout merged to central: https://hg.mozilla.org/mozilla-central/rev/414dba231f7f

Comment 12

[Ken VanDine]

There is an additional patch attached that fixes the build issue that caused this to be reverted.

Comment 13

[Johan Lorenzo [:jlorenzo]]

Ken and I both tested both patches. Latest try is at https://treeherder.mozilla.org/#/jobs?repo=try&revision=f9340198f4b18322ba7970bbbe24ccb920ec436b.

I think we're good to land this in central. No need to land this on beta anymore, we start a new beta cycle next week.

Comment 14

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/800b27ffb354
Find files provided by the base and platform snap and ensure they aren't duplicated in this snap r=jlorenzo

Comment 15

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/738219cbc8c1
extract gnome-3-28-1804 platform snap to be used in the cleanup part r=jlorenzo

Comment 16

[Andrei Ciure[:aciure]]

https://hg.mozilla.org/mozilla-central/rev/800b27ffb354
https://hg.mozilla.org/mozilla-central/rev/738219cbc8c1