Bug 1203155 - Update firefox-ui-tests config to use strict version package dependencies and optional packages. r=armenzg DONTBUILD

--HG--
extra : rebase_source : cef026ea3571555a6946c54080b29597d74089d9

testing/mozharness/configs/firefox_ui_tests/jenkins.py

@@ -0,0 +1,6 @@
+config = {
+    'virtualenv_modules': [
+        # optional packages we need for Jenkins
+        'mozdownload==1.17',
+    ]
+}

testing/mozharness/mozharness/base/python.py

@@ -160,7 +160,7 @@ class VirtualenvMixin(object):
 
         if log_output:
             self.info("Current package versions:")
-            for package in packages:
+            for package in sorted(packages):
                 self.info("  %s == %s" % (package, packages[package]))
 
         return packages

testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py

@@ -138,10 +138,17 @@ class FirefoxUITests(VCSToolsScript, VirtualenvMixin):
     def _pre_create_virtualenv(self, action):
         dirs = self.query_abs_dirs()
 
-        self.register_virtualenv_module(
-            'firefox-ui-tests',
-            url=dirs['fx_ui_dir'],
-        )
+        # List of exact versions of mozbase packages which are known to work
+        requirements_file = os.path.join(dirs['fx_ui_dir'], 'requirements.txt')
+        if os.path.isfile(requirements_file):
+            self.register_virtualenv_module(requirements=[requirements_file])
+
+        # Optional packages to be installed, e.g. for Jenkins
+        if self.config.get('virtualenv_modules'):
+            for module in self.config['virtualenv_modules']:
+                self.register_virtualenv_module(module)
+
+        self.register_virtualenv_module('firefox-ui-tests', url=dirs['fx_ui_dir'])
 
     def _query_symbols_url(self, installer_url):
         for suffix in INSTALLER_SUFFIXES:

testing/mozharness/scripts/firefox_ui_tests/update_release.py

@@ -215,8 +215,8 @@ class ReleaseFirefoxUIUpdateTests(FirefoxUIUpdateTests):
     @PreScriptAction('run-tests')
     def _pre_run_tests(self, action):
         assert ('release_update_config' in self.config or
-                self.installer_url or self.installer_path),
-                'Either specify --update-verify-config, --installer-url or --installer-path.'
+                self.installer_url or self.installer_path), \
+            'Either specify --update-verify-config, --installer-url or --installer-path.'
 
     def run_tests(self):
         dirs = self.query_abs_dirs()