Bug 1274655 - Set MOZ_SOURCE_REPO in mozharness to avoid variance from shared repos; r=jlund
☠☠ backed out by ff8388f0333f ☠ ☠
authorGregory Szorc <gps@mozilla.com>
Fri, 20 May 2016 12:46:27 -0700
changeset 337807 a2a4c06d9736850782d8cc52802e0207ca1bf27a
parent 337806 cd58054bde907f41e75c9f4a57c83994c23e6088
child 337808 d6e4c44790d2cb499f01d62a0ed3d97f4059eaa5
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlund
bugs1274655, 1270317
milestone49.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 1274655 - Set MOZ_SOURCE_REPO in mozharness to avoid variance from shared repos; r=jlund Recent changes to mozharness in bug 1270317 started using pooled shared storage for Mercurial repos. This means the "default" path in Mercurial repos is variable depending on which repo was the first to be built on a machine. By default, the Firefox build system resolves the source repository from `hg paths default`. This is now incorrect default behavior in automation. We fix the regression by setting MOZ_SOURCE_REPO in the environment to path to the repository that mozharness is currently building. MozReview-Commit-ID: 34IPf7PJfuA
testing/mozharness/mozharness/mozilla/building/buildbase.py
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -844,16 +844,21 @@ or run without that action (ie: --no-{ac
         # as we don't always want every key below added to the same dict
         env = copy.deepcopy(
             super(BuildScript, self).query_env(**kwargs)
         )
 
         # first grab the buildid
         env['MOZ_BUILD_DATE'] = self.query_buildid()
 
+        # Set the source repository to what we're building from since
+        # the default is to query `hg paths` which isn't reliable with pooled
+        # storage
+        env['MOZ_SOURCE_REPO'] = self.repo_path
+
         if self.query_is_nightly() or self.query_is_nightly_promotion():
             if self.query_is_nightly():
                 # nightly promotion needs to set update_channel but not do all the 'IS_NIGHTLY'
                 # automation parts like uploading symbols for now
                 env["IS_NIGHTLY"] = "yes"
             # in branch_specifics.py we might set update_channel explicitly
             if c.get('update_channel'):
                 env["MOZ_UPDATE_CHANNEL"] = c['update_channel']