Bug 1277595 - Use mozilla-central config-file on try draft
authorAnthony Miyaguchi <amiyaguchi@mozilla.com>
Wed, 27 Jul 2016 15:03:28 -0700
changeset 406272 a8c0fb297614cca20b19961a8207606996a58c2f
parent 406271 cf116682ee73f192a7856980b79379b798b869de
child 406273 9bb2fc6e57ebc5eb9f80f8df57082f7e48037b72
push id27674
push useramiyaguchi@mozilla.com
push dateFri, 26 Aug 2016 18:00:28 +0000
bugs1277595
milestone51.0a1
Bug 1277595 - Use mozilla-central config-file on try If there is no configuration file specified, mozharness will attempt to reference an invalid configuration file for try_android-api-15. This defaults to mozilla-central as the nightly branch. MozReview-Commit-ID: 28FjQhJJmOC
testing/mozharness/mozharness/mozilla/building/buildbase.py
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -1640,16 +1640,22 @@ or run without that action (ie: --no-{ac
             return
         self._initialize_taskcluster()
 
         dirs = self.query_abs_dirs()
         base_work_dir = dirs['base_work_dir']
         objdir = dirs['abs_obj_dir']
         branch = self.branch
 
+        # Building a nightly with the try repository fails because a
+        # config-file does not exist for try. Default to mozilla-central
+        # settings (arbitrarily).
+        if branch == 'try':
+            branch = 'mozilla-central'
+
         # Some android versions share the same .json config - if
         # multi_locale_config_platform is set, use that the .json name;
         # otherwise, use the buildbot platform.
         default_platform = self.buildbot_config['properties'].get('platform',
                                                                   'android')
 
         multi_config_pf = self.config.get('multi_locale_config_platform',
                                           default_platform)