Bug 1197224 - Part 3 Don't install packages in editable mode; r?jgriffin
authorMaja Frydrychowicz <mjzffr@gmail.com>
Wed, 23 Sep 2015 15:11:09 -0400
changeset 326846 78f26721ef4e5ca906d44179f8855ea9c954b1b8
parent 326845 29f9c826549fffd1c54d1a0dc33f9785a4747f48
child 326847 769a602cfe63d8774027c10206caed2004cf7b52
push id10169
push userdminor@mozilla.com
push dateThu, 28 Jan 2016 13:10:48 +0000
reviewersjgriffin
bugs1197224
milestone43.0a1
Bug 1197224 - Part 3 Don't install packages in editable mode; r?jgriffin
testing/mozharness/configs/mediatests/buildbot_windows_config.py
testing/mozharness/mozharness/mozilla/testing/firefox_media_tests.py
--- a/testing/mozharness/configs/mediatests/buildbot_windows_config.py
+++ b/testing/mozharness/configs/mediatests/buildbot_windows_config.py
@@ -18,19 +18,16 @@ config = {
                        '%s/build/venv/scripts/mozinstall-script.py' % os.getcwd()],
         'tooltool.py': [sys.executable, 'C:/mozilla-build/tooltool.py'],
         'gittool.py': [sys.executable,
                        os.path.join(external_tools_path, 'gittool.py')],
         'hgtool.py': [sys.executable,
                       os.path.join(external_tools_path, 'hgtool.py')],
 
     },
-    'env': {
-        'PATH': '%(PATH)s;' + 'C:/mozilla-build/Git/bin',
-    },
 
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
     "pip_index": False,
 
     "buildbot_json_path": "buildprops.json",
@@ -49,14 +46,14 @@ config = {
     ],
     "blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
     "in_tree_config": "config/mozharness/marionette.py",
     "download_minidump_stackwalk": True,
     "download_symbols": "ondemand",
 
     "firefox_media_repo": 'https://github.com/mjzffr/firefox-media-tests.git',
     "firefox_media_branch": 'master',
-    "firefox_media_rev": '82c45fba24457b5fe447e967bbcaaec5eb14e3ee',
+    "firefox_media_rev": 'b11d6c3d7f6af166be314d2ac6673e78c1edb566',
     "firefox_ui_repo": 'https://github.com/mozilla/firefox-ui-tests.git',
     "firefox_ui_branch": 'master',
     "firefox_ui_rev": '6d6d57917f85399e903ac69b7e4297091b2d474c',
 
 }
--- a/testing/mozharness/mozharness/mozilla/testing/firefox_media_tests.py
+++ b/testing/mozharness/mozharness/mozilla/testing/firefox_media_tests.py
@@ -152,25 +152,24 @@ class FirefoxMediaTestsBase(TestingMixin
         self.profile = c.get('profile')
         self.test_timeout = int(c.get('test_timeout'))
         self.tests = c.get('tests')
         self.e10s = c.get('e10s')
 
     @PreScriptAction('create-virtualenv')
     def _pre_create_virtualenv(self, action):
         dirs = self.query_abs_dirs()
-        # cwd is $workspace/build
+        requirements_file = os.path.join(dirs['firefox_media_dir'],
+                                         'requirements.txt')
+        if os.path.isfile(requirements_file):
+            self.register_virtualenv_module(requirements=[requirements_file])
         self.register_virtualenv_module(name='firefox-ui-tests',
-                                        url=dirs['firefox_ui_dir'],
-                                        method='pip',
-                                        editable='true')
+                                        url=dirs['firefox_ui_dir'])
         self.register_virtualenv_module(name='firefox-media-tests',
-                                        url=dirs['firefox_media_dir'],
-                                        method='pip',
-                                        editable='true')
+                                        url=dirs['firefox_media_dir'])
 
     def query_abs_dirs(self):
         if self.abs_dirs:
             return self.abs_dirs
         abs_dirs = super(FirefoxMediaTestsBase, self).query_abs_dirs()
         dirs = {
             'firefox_media_dir': os.path.join(abs_dirs['abs_work_dir'],
                                               'firefox-media-tests')