Bug 1454682 - Update mergeday configuration for the new esr60 branch r=rail
authorJohan Lorenzo <jlorenzo@mozilla.com>
Tue, 17 Apr 2018 17:37:50 +0200
changeset 468204 ed1028a2a78c1e77552a7ef8776654bcfab544e6
parent 468203 41d1450450f7e56f31ff34b424c722922eb520fe
child 468205 0f30e3a7589b2094e5e41f7a3234e22aa7b79903
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrail
bugs1454682
milestone61.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 1454682 - Update mergeday configuration for the new esr60 branch r=rail MozReview-Commit-ID: 1fWTZYV2sT5
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,15 +1,12 @@
 import os
 
 ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
-NEW_ESR_REPO = "https://hg.mozilla.org/releases/mozilla-esr59"
-# ESR-specific branding (logo) lives in the old repo:
-OLD_ESR_REPO = "https://hg.mozilla.org/releases/mozilla-esr52"
-OLD_ESR_CHANGESET = "df0931ac8b02"
+NEW_ESR_REPO = "https://hg.mozilla.org/releases/mozilla-esr60"
 
 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": ""},
     ],
@@ -39,15 +36,11 @@ config = {
     "tools_repo_url": "https://hg.mozilla.org/build/tools",
     "tools_repo_branch": "default",
     "from_repo_url": "https://hg.mozilla.org/releases/mozilla-release",
     "to_repo_url": NEW_ESR_REPO,
 
     "base_tag": "FIREFOX_ESR_%(major_version)s_BASE",
     "migration_behavior": "release_to_esr",
     "require_remove_locales": False,
-    "graft_patches": [
-        {"repo": OLD_ESR_REPO,
-         "changeset": OLD_ESR_CHANGESET},
-    ],
     "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
@@ -396,49 +396,24 @@ class GeckoMigration(MercurialScript, Ba
                 os.path.join(dirs['abs_to_dir'], "browser/locales/shipped-locales"),
                 self.config['remove_locales']
             )
         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()
-        for to_graft in self.config.get("graft_patches", []):
-            self.graft(repo=to_graft["repo"], changeset=to_graft["changeset"],
-                       cwd=dirs['abs_to_dir'])
         self.apply_replacements()
         self.touch_clobber_file(dirs['abs_to_dir'])
 
     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 graft(self, repo, changeset, cwd):
-        """Graft a Mercurial changeset from a remote repository."""
-        hg = self.query_exe("hg", return_type="list")
-        self.info("Pulling %s from %s" % (changeset, repo))
-        pull_cmd = hg + ["pull", "-r", changeset, repo]
-        status = self.run_command(
-            pull_cmd,
-            cwd=cwd,
-            error_list=HgErrorList,
-        )
-        if status != 0:
-            self.fatal("Cannot pull %s from %s properly" % (changeset, repo))
-        cmd = hg + ["graft", changeset]
-        self.info("Grafting %s from %s" % (changeset, repo))
-        status = self.run_command(
-            cmd,
-            cwd=cwd,
-            error_list=HgErrorList,
-        )
-        if status != 0:
-            self.fatal("Cannot graft %s from %s properly" % (changeset, repo))
-
     def pull_from_repo(self, from_dir, to_dir, revision=None, branch=None):
         """ Pull from one repo to another. """
         hg = self.query_exe("hg", return_type="list")
         cmd = hg + ["pull"]
         if revision:
             cmd.extend(["-r", revision])
         cmd.append(from_dir)
         self.run_command(