Bug 1522223 - Set UPLOAD_PATH during make check to avoid re-running configure. r=Callek, a=test-only
authorChris Manchester <cmanchester@mozilla.com>
Thu, 31 Jan 2019 21:49:35 +0000
changeset 515708 ecaa5a9d6e3fcbb82587915863f0b852896742df
parent 515707 a509901b44dc88c5387b2089e51d2873599c1a7f
child 515709 cf0c39ffce35def8fe8091f0192f187337df3223
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek, test-only
bugs1522223
milestone66.0
Bug 1522223 - Set UPLOAD_PATH during make check to avoid re-running configure. r=Callek, a=test-only Differential Revision: https://phabricator.services.mozilla.com/D18140
testing/mozharness/mozharness/mozilla/building/buildbase.py
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -901,16 +901,21 @@ or run without that action (ie: --no-{ac
 
     def query_check_test_env(self):
         c = self.config
         dirs = self.query_abs_dirs()
         check_test_env = {}
         if c.get('check_test_env'):
             for env_var, env_value in c['check_test_env'].iteritems():
                 check_test_env[env_var] = env_value % dirs
+        # Check tests don't upload anything, however our mozconfigs depend on
+        # UPLOAD_PATH, so we prevent configure from re-running by keeping the
+        # environments consistent.
+        if c.get('upload_env'):
+            check_test_env.update(c['upload_env'])
         return check_test_env
 
     def _rm_old_package(self):
         """rm the old package."""
         c = self.config
         dirs = self.query_abs_dirs()
         old_package_paths = []
         old_package_patterns = c.get('old_packages')