1775070 - release-to-esr migration broken ("versions already match")

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P1)

Description

[Julien Cristau [:jcristau]]

Running a dry-run release-to-esr migration (https://firefox-ci-tc.services.mozilla.com/tasks/M_C97WxcQUGQ0kwv5qWVJw) ended with:
2022-06-20 11:36:28,241 - treescript.merges - INFO - Skipping merge: release and esr102 versions already match (102)

treescript currently expects that when migrating across 2 repos, they don't have the same major version.

It occurs to me that release-to-esr doesn't really care what's on mozilla-release, it just changes the version number on esr. And e.g. https://hg.mozilla.org/releases/mozilla-esr78/file/e583d49dcc205572b5e662935516037c698ae7be/testing/mozharness/configs/merge_day/release_to_esr.py does not actually reference mozilla-release, so the in-tree config for this task is maybe wrong?

Comment 1

[Julien Cristau [:jcristau]]

Attachment: Bug 1775070 - fix release-to-esr migration config. r?#releng

Instead of pretending we're merging from release, just apply the
version bumps / replacements on the current state of the esr tree.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/7f6047ee9ed6
fix release-to-esr migration config. r=releng-reviewers,jlorenzo DONTBUILD

Comment 3

[Julien Cristau [:jcristau]]

https://hg.mozilla.org/releases/mozilla-release/rev/3ea5c8008221

Comment 4

[Cosmin Sabou [:CosminS]]

https://hg.mozilla.org/mozilla-central/rev/7f6047ee9ed6