Backed out changeset 747d0b814dc1 (bug 1452179) for talos failures. CLOSED TREE
authorCsoregi Natalia <ncsoregi@mozilla.com>
Tue, 17 Apr 2018 21:12:24 +0300
changeset 414171 33d4420119d61139f2cb7ced1cd73ba72efe8cc2
parent 414170 725ba91eecc190ef12642b354bee2203c1c59455
child 414172 8c866545bc7cc179067045b3efc760db40fb945b
push id33861
push userccoroiu@mozilla.com
push dateWed, 18 Apr 2018 10:50:38 +0000
treeherdermozilla-central@4af4ae0aee55 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1452179
milestone61.0a1
backs out747d0b814dc1be3e5ac04e080361ab0b0fc034f9
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
Backed out changeset 747d0b814dc1 (bug 1452179) for talos failures. CLOSED TREE
testing/mozharness/mozharness/mozilla/testing/talos.py
testing/mozharness/scripts/desktop_unittest.py
testing/mozharness/scripts/release/antivirus.py
testing/mozharness/scripts/release/generate-checksums.py
testing/mozharness/scripts/release/push-candidate-to-releases.py
--- a/testing/mozharness/mozharness/mozilla/testing/talos.py
+++ b/testing/mozharness/mozharness/mozilla/testing/talos.py
@@ -619,17 +619,20 @@ class Talos(TestingMixin, MercurialScrip
                 'config',
                 'mozbase_source_requirements.txt'
             )
         self.register_virtualenv_module(
             requirements=[mozbase_requirements],
             two_pass=True,
             editable=True,
         )
-        super(Talos, self).create_virtualenv()
+        # require pip >= 1.5 so pip will prefer .whl files to install
+        super(Talos, self).create_virtualenv(
+            modules=['pip>=1.5']
+        )
         # talos in harness requires what else is
         # listed in talos requirements.txt file.
         self.install_module(
             requirements=[os.path.join(self.talos_path,
                                        'requirements.txt')]
         )
 
     def _validate_treeherder_data(self, parser):
--- a/testing/mozharness/scripts/desktop_unittest.py
+++ b/testing/mozharness/scripts/desktop_unittest.py
@@ -314,17 +314,18 @@ class DesktopUnittest(TestingMixin, Merc
         else:
             self.abs_res_dir = abs_app_dir
         return self.abs_res_dir
 
     @PreScriptAction('create-virtualenv')
     def _pre_create_virtualenv(self, action):
         dirs = self.query_abs_dirs()
 
-        self.register_virtualenv_module('psutil==5.4.3')
+        self.register_virtualenv_module(name='pip>=1.5')
+        self.register_virtualenv_module('psutil==5.4.3', method='pip')
         self.register_virtualenv_module(name='mock')
         self.register_virtualenv_module(name='simplejson')
 
         requirements_files = [os.path.join(dirs['abs_test_install_dir'],
                               'config', 'marionette_requirements.txt')]
 
         if self._query_specified_suites('mochitest') is not None:
             # mochitest is the only thing that needs this
--- a/testing/mozharness/scripts/release/antivirus.py
+++ b/testing/mozharness/scripts/release/antivirus.py
@@ -74,16 +74,17 @@ class AntivirusScan(BaseScript, Virtuale
     CACHE_DIR = 'cache'
 
     def __init__(self):
         BaseScript.__init__(self,
                             config_options=self.config_options,
                             require_config_file=False,
                             config={
                                 "virtualenv_modules": [
+                                    "pip==1.5.5",
                                     "boto",
                                     "redo",
                                     "mar",
                                 ],
                                 "virtualenv_path": "venv",
                             },
                             all_actions=[
                                 "create-virtualenv",
--- a/testing/mozharness/scripts/release/generate-checksums.py
+++ b/testing/mozharness/scripts/release/generate-checksums.py
@@ -52,16 +52,17 @@ class ChecksumsGenerator(BaseScript, Vir
     ] + virtualenv_config_options
 
     def __init__(self):
         BaseScript.__init__(self,
                             config_options=self.config_options,
                             require_config_file=False,
                             config={
                                 "virtualenv_modules": [
+                                    "pip==1.5.5",
                                     "boto",
                                 ],
                                 "virtualenv_path": "venv",
                             },
                             all_actions=[
                                 "create-virtualenv",
                                 "collect-individual-checksums",
                                 "create-big-checksums",
--- a/testing/mozharness/scripts/release/push-candidate-to-releases.py
+++ b/testing/mozharness/scripts/release/push-candidate-to-releases.py
@@ -64,16 +64,17 @@ class ReleasePusher(BaseScript, Virtuale
     ] + virtualenv_config_options
 
     def __init__(self, aws_creds):
         BaseScript.__init__(self,
                             config_options=self.config_options,
                             require_config_file=False,
                             config={
                                     "virtualenv_modules": [
+                                        "pip==1.5.5",
                                         "boto",
                                         "redo",
                                     ],
                                     "virtualenv_path": "venv",
                                    },
                             all_actions=[
                                 "create-virtualenv",
                                 "activate-virtualenv",