1606889 - Clean up references to obsolete ESR branches

Status: RESOLVED FIXED

(Firefox Build System :: General, task)

Description

[Ryan VanderMeulen [:RyanVM]]

I noticed today that we have some in-tree references to old ESR branches which aren't supported anymore. Let's clean that up.

Comment 1

[Ryan VanderMeulen [:RyanVM]]

Assuming I update https://searchfox.org/mozilla-central/source/taskcluster/ci/release-snap-push/kind.yml#33 to point esr68 at esr/stable, do we need to land that change on ESR68 as well?

Comment 2

[Ryan VanderMeulen [:RyanVM]]

It's not clear to me what purpose https://searchfox.org/mozilla-central/source/testing/mozharness/configs/merge_day/bump_esr.py serves either. I'm wondering if ESR60 isn't the only crusty content in that directory, though.

Comment 3

[Johan Lorenzo [:jlorenzo]]

(In reply to Ryan VanderMeulen [:RyanVM] from comment #1)

Assuming I update https://searchfox.org/mozilla-central/source/taskcluster/ci/release-snap-push/kind.yml#33 to point esr68 at esr/stable, do we need to land that change on ESR68 as well?

Yes, please 🙂 Task configurations are tied to a given tree. Since we're changing something related to ESR, it must go to the esr68 tree. I thought we needed to change esr60 too, but the channel is not specified there[1]. We actually changed the behavior in [2] and made it backward compatible with esr60. Therefore, it's time to get rid of this logic[3]. I'm happy to review the the patch for release-snap-push/kind.yml while I'm taking the one on the scriptworker end.

[1] https://searchfox.org/mozilla-esr60/rev/02b4ae79b24aae2346b1338e2bf095a571192061/taskcluster/ci/release-snap-push/kind.yml
[2] https://github.com/mozilla-releng/pushsnapscript/pull/24
[3] https://github.com/mozilla-releng/scriptworker-scripts/blob/c82dcc5d3503665f7790bf2c075640038eaf1cee/pushsnapscript/src/pushsnapscript/task.py#L16-L25

Comment 4

[Johan Lorenzo [:jlorenzo]]

Attachment: [scriptworker-scripts] pushsnapscript: Stop supporting tasks with no channel in payload

Comment 5

[Ryan VanderMeulen [:RyanVM]]

OK, I'm going to ignore bump_esr.py from comment 2 for now under the assumption that more cleanup can be done there besides just the one ESR-related change. I'll submit the rest of the patch for review and an ESR68-specific patch for comment 1 also.

Comment 6

[Ryan VanderMeulen [:RyanVM]]

Attachment: Bug 1606889 - Clean up references to obsolete ESR branches. r=tomprince

Comment 7

[Ryan VanderMeulen [:RyanVM]]

Attachment: Bug 1606889 - [ESR68] Publish ESR Snap builds to the esr/stable channel instead of esr/candidate. r=jlorenzo, a=release

Comment 8

[Ryan VanderMeulen [:RyanVM]]

ESR68 patch pushed to default and the 68.4.x relbranch:
https://hg.mozilla.org/releases/mozilla-esr68/rev/c10b5cef353bb7ec65619092a3013fe19140f337 (default)
https://hg.mozilla.org/releases/mozilla-esr68/rev/b95acd0db42d5457d65b0a6847c7ae360729fed7 (FIREFOX_ESR_68_4_X_RELBRANCH)

Comment 9

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/84052ee4136c
Clean up references to obsolete ESR branches. r=tomprince

Comment 10

[Noemi Erli[:noemi_erli]]

https://hg.mozilla.org/mozilla-central/rev/84052ee4136c