Bug 1428049 - [talos] Create a separate mozbase_source_requirements.txt when installing packages from the source dir, r=igoldan
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Thu, 04 Jan 2018 09:58:45 -0500
changeset 397788 c2de67592fbdb1bf09eb122af18aa61b2e3203d2
parent 397787 0a6dc8478a57b58d9a83339b48ad0e95a3c6f41f
child 397789 6310cc3692ff05de803f317639f3b62af272b4d3
push id57542
push userahalberstadt@mozilla.com
push dateThu, 04 Jan 2018 18:49:14 +0000
treeherderautoland@6310cc3692ff [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersigoldan
bugs1428049
milestone59.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 1428049 - [talos] Create a separate mozbase_source_requirements.txt when installing packages from the source dir, r=igoldan This fixes a regression to |mach talos-test| around a missing 'mozterm' dependency. MozReview-Commit-ID: GcfoA4U1fqg
testing/config/mozbase_requirements.txt
testing/config/mozbase_source_requirements.txt
testing/mozharness/mozharness/mozilla/testing/talos.py
--- a/testing/config/mozbase_requirements.txt
+++ b/testing/config/mozbase_requirements.txt
@@ -1,8 +1,10 @@
+../tools/mozterm
+
 ../mozbase/manifestparser
 ../mozbase/mozcrash
 ../mozbase/mozdebug
 ../mozbase/mozdevice
 ../mozbase/mozfile
 ../mozbase/mozhttpd
 ../mozbase/mozinfo
 ../mozbase/mozinstall
@@ -10,10 +12,8 @@
 ../mozbase/mozlog
 ../mozbase/moznetwork
 ../mozbase/mozprocess
 ../mozbase/mozprofile
 ../mozbase/mozrunner
 ../mozbase/mozscreenshot
 ../mozbase/moztest
 ../mozbase/mozversion
-
-../tools/mozterm
new file mode 100644
--- /dev/null
+++ b/testing/config/mozbase_source_requirements.txt
@@ -0,0 +1,19 @@
+../../python/mozterm
+
+../mozbase/manifestparser
+../mozbase/mozcrash
+../mozbase/mozdebug
+../mozbase/mozdevice
+../mozbase/mozfile
+../mozbase/mozhttpd
+../mozbase/mozinfo
+../mozbase/mozinstall
+../mozbase/mozleak
+../mozbase/mozlog
+../mozbase/moznetwork
+../mozbase/mozprocess
+../mozbase/mozprofile
+../mozbase/mozrunner
+../mozbase/mozscreenshot
+../mozbase/moztest
+../mozbase/mozversion
--- a/testing/mozharness/mozharness/mozilla/testing/talos.py
+++ b/testing/mozharness/mozharness/mozilla/testing/talos.py
@@ -573,17 +573,17 @@ class Talos(TestingMixin, MercurialScrip
                 'tests',
                 'config',
                 'mozbase_requirements.txt'
             )
         else:
             mozbase_requirements = os.path.join(
                 os.path.dirname(self.talos_path),
                 'config',
-                'mozbase_requirements.txt'
+                'mozbase_source_requirements.txt'
             )
         self.register_virtualenv_module(
             requirements=[mozbase_requirements],
             two_pass=True,
             editable=True,
         )
         # require pip >= 1.5 so pip will prefer .whl files to install
         super(Talos, self).create_virtualenv(