Bug 1557190: Update esr migration script for esr68; r=Callek
authorTom Prince <mozilla@hocat.ca>
Sun, 30 Jun 2019 20:57:00 +0000
changeset 543583 696aa5fa31ea5c39cee412a6cecfd4af19f845fd
parent 543582 7d964bfcda0e0aded01a4fb05a8405b9cb61bafd
child 543584 da65877c0fec3c21af44c542bada87ea8e8c6eea
push id2131
push userffxbld-merge
push dateMon, 26 Aug 2019 18:30:20 +0000
treeherdermozilla-release@b19ffb3ca153 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs1557190
milestone69.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1557190: Update esr migration script for esr68; r=Callek Differential Revision: https://phabricator.services.mozilla.com/D36368
testing/mozharness/configs/merge_day/release_to_esr.py
testing/mozharness/scripts/merge_day/gecko_migration.py
--- a/testing/mozharness/configs/merge_day/release_to_esr.py
+++ b/testing/mozharness/configs/merge_day/release_to_esr.py
@@ -1,19 +1,17 @@
 import os
 
 ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
-NEW_ESR_REPO = "https://hg.mozilla.org/releases/mozilla-esr60"
+NEW_ESR_REPO = "https://hg.mozilla.org/releases/mozilla-esr68"
 
 config = {
     "log_name": "relese_to_esr",
     "version_files": [
-        {"file": "browser/config/version.txt", "suffix": ""},
-        {"file": "browser/config/version_display.txt", "suffix": ""},
-        {"file": "config/milestone.txt", "suffix": ""},
+        {"file": "browser/config/version_display.txt", "suffix": "esr"},
     ],
     "replacements": [
         # File, from, to
         ("browser/confvars.sh",
          "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release",
          "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-esr"),
         ("browser/confvars.sh",
          "MAR_CHANNEL_ID=firefox-mozilla-release",
@@ -21,18 +19,19 @@ config = {
         ("build/mozconfig.common",
          "# Enable enforcing that add-ons are signed by the trusted root",
          "# Disable enforcing that add-ons are signed by the trusted root"),
         ("build/mozconfig.common",
          "MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-1}",
          "MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-0}"),
     ],
     "vcs_share_base": os.path.join(ABS_WORK_DIR, 'hg-shared'),
-    # "hg_share_base": None,
-    "from_repo_url": "https://hg.mozilla.org/releases/mozilla-release",
+    # Pull from ESR repo, since we have already branched it and have landed esr-specific patches on it
+    # We will need to manually merge mozilla-release into before runnning this.
+    "from_repo_url": NEW_ESR_REPO,
     "to_repo_url": NEW_ESR_REPO,
 
     "base_tag": "FIREFOX_ESR_%(major_version)s_BASE",
     "migration_behavior": "release_to_esr",
     "require_remove_locales": False,
     "requires_head_merge": False,
     "pull_all_branches": False,
 }
--- a/testing/mozharness/scripts/merge_day/gecko_migration.py
+++ b/testing/mozharness/scripts/merge_day/gecko_migration.py
@@ -385,16 +385,19 @@ class GeckoMigration(MercurialScript, Vi
             )
         self.touch_clobber_file(dirs['abs_to_dir'])
 
     def release_to_esr(self, *args, **kwargs):
         """ mozilla-release -> mozilla-esrNN behavior. """
         dirs = self.query_abs_dirs()
         self.apply_replacements()
         self.touch_clobber_file(dirs['abs_to_dir'])
+        next_esr_version = self.get_version(dirs['abs_to_dir'])[0]
+        self.bump_version(dirs['abs_to_dir'], next_esr_version, next_esr_version, "", "",
+                          use_config_suffix=True)
 
     def apply_replacements(self):
         dirs = self.query_abs_dirs()
         for f, from_, to in self.config["replacements"]:
             self.replace(os.path.join(dirs['abs_to_dir'], f), from_, to)
 
     def pull_from_repo(self, from_dir, to_dir, revision=None, branch=None):
         """ Pull from one repo to another. """