Bug 1225568 - Install psutil from a wheel for windows builds so we can get build stats on dep builds. r=jlund
authorChris Manchester <cmanchester@mozilla.com>
Thu, 19 Nov 2015 11:34:59 -0800
changeset 273402 39db40982d31fe595c259394cae7bf6f72a3e762
parent 273401 d8994bf7278378d30a2663d3921df2bca6c7783f
child 273403 d69c0607d8b1702009b059e71e1558ad13102919
push id29702
push usercbook@mozilla.com
push dateFri, 20 Nov 2015 12:13:22 +0000
treeherdermozilla-central@ec628289d8b4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlund
bugs1225568
milestone45.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 1225568 - Install psutil from a wheel for windows builds so we can get build stats on dep builds. r=jlund The psutil extension gets built on windows build machines during configure, but that step only runs consistently after a clobber. This patch installs psutil from a wheel in the mozharness virtualenv so it's available in mozharness independent of what happens in the build.
testing/mozharness/configs/builds/releng_base_windows_32_builds.py
testing/mozharness/configs/builds/releng_base_windows_64_builds.py
testing/mozharness/scripts/fx_desktop_build.py
--- a/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
@@ -55,16 +55,29 @@ config = {
     'objdir': 'obj-firefox',
     'tooltool_script': [sys.executable,
                         'C:/mozilla-build/tooltool.py'],
     'tooltool_bootstrap': "setup.sh",
     'enable_count_ctors': False,
     'enable_talos_sendchange': True,
     'enable_unittest_sendchange': True,
     'max_build_output_timeout': 60 * 80,
+
+    # Windows dep builds in infra don't pick up psutil correctly when configure
+    # doesn't run, but really we want it all the time. This is in the platform
+    # specific base windows configs, because doing this globally causes linux
+    # builders to fail trying to build psutil before a C compiler is installed
+    # as part of the build.
+    'virtualenv_modules': [
+        'pip>=1.5',
+        'psutil==3.1.1',
+        'requests==2.2.1',
+        'PyHawk-with-a-single-extra-commit==0.1.5',
+        'taskcluster==0.0.15',
+    ],
     #########################################################################
 
 
      #########################################################################
      ###### 32 bit specific ######
     'base_name': 'WINNT_5.2_%(branch)s',
     'platform': 'win32',
     'stage_platform': 'win32',
--- a/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
@@ -55,16 +55,29 @@ config = {
     'objdir': 'obj-firefox',
     'tooltool_script': [sys.executable,
                         'C:/mozilla-build/tooltool.py'],
     'tooltool_bootstrap': "setup.sh",
     'enable_count_ctors': False,
     'enable_talos_sendchange': True,
     'enable_unittest_sendchange': True,
     'max_build_output_timeout': 60 * 80,
+
+    # Windows dep builds in infra don't pick up psutil correctly when configure
+    # doesn't run, but really we want it all the time. This is in the platform
+    # specific base windows configs, because doing this globally causes linux
+    # builders to fail trying to build psutil before a C compiler is installed
+    # as part of the build.
+    'virtualenv_modules': [
+        'pip>=1.5',
+        'psutil==3.1.1',
+        'requests==2.2.1',
+        'PyHawk-with-a-single-extra-commit==0.1.5',
+        'taskcluster==0.0.15',
+    ],
     #########################################################################
 
 
      #########################################################################
      ###### 64 bit specific ######
     'base_name': 'WINNT_6.1_x86-64_%(branch)s',
     'platform': 'win64',
     'stage_platform': 'win64',
--- a/testing/mozharness/scripts/fx_desktop_build.py
+++ b/testing/mozharness/scripts/fx_desktop_build.py
@@ -84,16 +84,20 @@ class FxDesktopBuild(BuildScript, object
                 'tinderbox_build_dir': None,
                 'to_tinderbox_dated': True,
                 'release_to_try_builds': False,
                 'include_post_upload_builddir': False,
                 'use_clobberer': True,
 
                 'stage_username': 'ffxbld',
                 'stage_ssh_key': 'ffxbld_rsa',
+
+                # If adding values here, consider including them in windows-
+                # specific configs as well (and note the comment there about
+                # building C extensions on linux builders).
                 'virtualenv_modules': [
                     'requests==2.2.1',
                     'PyHawk-with-a-single-extra-commit==0.1.5',
                     'taskcluster==0.0.15',
                 ],
                 'virtualenv_path': 'venv',
                 #