Bug 1206668 - remove confvars.sh in beta_to_release merge script, DONTBUILD NPOTB r=rail
authorJordan Lund <jlund@mozilla.com>
Thu, 03 Dec 2015 19:54:48 -0800
changeset 275623 955bd1d9ae21a8491b836c6f4ca463496f10f32d
parent 275622 3021d7cf0c80ef566ef80eea82f43074d2036757
child 275624 ddf13e6aa97ef9585b9d06deab3ee9b1e0ce81d3
push id29759
push usercbook@mozilla.com
push dateFri, 04 Dec 2015 10:59:21 +0000
treeherdermozilla-central@e02b17a2b5b8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrail
bugs1206668
milestone45.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 1206668 - remove confvars.sh in beta_to_release merge script, DONTBUILD NPOTB r=rail
testing/mozharness/configs/merge_day/beta_to_release.py
--- a/testing/mozharness/configs/merge_day/beta_to_release.py
+++ b/testing/mozharness/configs/merge_day/beta_to_release.py
@@ -1,15 +1,14 @@
 config = {
     "log_name": "beta_to_release",
     "version_files": [
         "browser/config/version.txt",
         "browser/config/version_display.txt",
         "config/milestone.txt",
-        "mobile/android/confvars.sh",  # TODO: remove this line before gecko 43 merge
         "b2g/confvars.sh",
     ],
     "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/",