Bug 1262325 - Reset mozilla-release version_display.txt on merge r=jlund a=release DONTBUILD draft
authorRail Aliiev <rail@mozilla.com>
Wed, 06 Apr 2016 13:36:28 -0400
changeset 348108 6f42ca7078c492cee0bae492414bcde6ac205493
parent 348068 5acaba393ffe9aed0d0d28c386e7d9f190fa52fd
child 517786 6878a319459ad1c3072c64d282c919645c2d4d55
push id14753
push userbmo:rail@mozilla.com
push dateWed, 06 Apr 2016 17:38:25 +0000
reviewersjlund, release
bugs1262325
milestone48.0a1
Bug 1262325 - Reset mozilla-release version_display.txt on merge r=jlund a=release DONTBUILD MozReview-Commit-ID: FuwLmYTuWgA
testing/mozharness/configs/merge_day/beta_to_release.py
testing/mozharness/scripts/merge_day/gecko_migration.py
--- a/testing/mozharness/configs/merge_day/beta_to_release.py
+++ b/testing/mozharness/configs/merge_day/beta_to_release.py
@@ -1,21 +1,22 @@
 config = {
     "log_name": "beta_to_release",
-    "version_files": [
-        {"file": "browser/config/version.txt", "suffix": ""},
-        {"file": "browser/config/version_display.txt", "suffix": ""},
-        {"file": "config/milestone.txt", "suffix": ""},
+    "copy_files": [
+        {
+            "src": "browser/config/version.txt",
+            "dst": "browser/config/version_display.txt",
+        },
     ],
     "replacements": [
         # File, from, to
         ("{}/{}".format(d, f),
         "ac_add_options --with-branding=mobile/android/branding/beta",
         "ac_add_options --with-branding=mobile/android/branding/official")
-        for d in ["mobile/android/config/mozconfigs/android-api-11/",
+        for d in ["mobile/android/config/mozconfigs/android-api-15/",
                   "mobile/android/config/mozconfigs/android-api-9-10-constrained/",
                   "mobile/android/config/mozconfigs/android-x86/"]
         for f in ["debug", "nightly", "l10n-nightly", "l10n-release", "release"]
     ] + [
         # File, from, to
         ("browser/confvars.sh",
          "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release",
          "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release"),
@@ -43,8 +44,9 @@ config = {
         "requests==2.8.1",
     ],
 
     "post_merge_builders": [],
     "post_merge_nightly_branches": [
         # No nightlies on mozilla-release
     ],
 }
+
--- a/testing/mozharness/scripts/merge_day/gecko_migration.py
+++ b/testing/mozharness/scripts/merge_day/gecko_migration.py
@@ -365,16 +365,22 @@ class GeckoMigration(MercurialScript, Ba
         """ mozilla-beta -> mozilla-release behavior.
 
             We could have all of these individually toggled by flags, but
             by separating into workflow methods we can be more precise about
             what happens in each workflow, while allowing for things like
             staging beta user repo migrations.
             """
         dirs = self.query_abs_dirs()
+        # Reset display_version.txt
+        for f in self.config["copy_files"]:
+            self.copyfile(
+                os.path.join(dirs['abs_to_dir'], f["src"]),
+                os.path.join(dirs['abs_to_dir'], f["dst"]))
+
         self.apply_replacements()
         if self.config.get("remove_locales"):
             self.remove_locales(
                 os.path.join(dirs['abs_to_dir'], "browser/locales/shipped-locales"),
                 self.config['remove_locales']
             )
         self.touch_clobber_file(dirs['abs_to_dir'])