Bug 1357753: set correct virtualenv, python paths; r=jlund
authorDustin J. Mitchell <dustin@mozilla.com>
Wed, 10 May 2017 20:24:08 +0000
changeset 409438 1f135333d095525ffebafd7f774f246995207b3d
parent 409437 d267e93bfec417089317acc7a1602dd003fc04e6
child 409439 e7703bd2ef36bca028dea4f2b93c611a68b5d120
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlund
bugs1357753
milestone55.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 1357753: set correct virtualenv, python paths; r=jlund The `remove_exes.py` config left mozharness searching for exes, but we do need a path to tooltool, since it is not in $PATH. MozReview-Commit-ID: I9gk8rNOmda
taskcluster/ci/test/tests.yml
testing/mozharness/configs/talos/linux_config.py
--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -1230,21 +1230,19 @@ talos-chrome:
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
-                    - remove_executables.py
                     - talos/mac_config.py
                 default:
                     - talos/linux_config.py
-                    - remove_executables.py
         extra-options:
             - --suite=chromez
             - --add-option
             - --webServer,localhost
 
 talos-dromaeojs:
     description: "Talos dromaeojs"
     suite: talos
@@ -1257,21 +1255,19 @@ talos-dromaeojs:
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
-                    - remove_executables.py
                     - talos/mac_config.py
                 default:
                     - talos/linux_config.py
-                    - remove_executables.py
         extra-options:
             - --suite=dromaeojs
             - --add-option
             - --webServer,localhost
 
 talos-g1:
     description: "Talos g1"
     suite: talos
@@ -1284,21 +1280,19 @@ talos-g1:
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
-                    - remove_executables.py
                     - talos/mac_config.py
                 default:
                     - talos/linux_config.py
-                    - remove_executables.py
         extra-options:
             - --suite=g1
             - --add-option
             - --webServer,localhost
 
 talos-g2:
     description: "Talos g2"
     suite: talos
@@ -1312,21 +1306,19 @@ talos-g2:
             default: ['mozilla-beta', 'mozilla-aurora', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try'] 
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
-                    - remove_executables.py
                     - talos/mac_config.py
                 default:
                     - talos/linux_config.py
-                    - remove_executables.py
         extra-options:
             - --suite=g2
             - --add-option
             - --webServer,localhost
 
 talos-g3:
     description: "Talos g3"
     suite: talos
@@ -1339,21 +1331,19 @@ talos-g3:
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
-                    - remove_executables.py
                     - talos/mac_config.py
                 default:
                     - talos/linux_config.py
-                    - remove_executables.py
         extra-options:
             - --suite=g3
             - --add-option
             - --webServer,localhost
 
 talos-g4:
     description: "Talos g4"
     suite: talos
@@ -1366,21 +1356,19 @@ talos-g4:
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
-                    - remove_executables.py
                     - talos/mac_config.py
                 default:
                     - talos/linux_config.py
-                    - remove_executables.py
         extra-options:
             - --suite=g4
             - --add-option
             - --webServer,localhost
 
 talos-g5:
     description: "Talos g5"
     suite: talos
@@ -1420,21 +1408,19 @@ talos-other:
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
-                    - remove_executables.py
                     - talos/mac_config.py
                 default:
                     - talos/linux_config.py
-                    - remove_executables.py
         extra-options:
             - --suite=other
             - --add-option
             - --webServer,localhost
 
 talos-perf-reftest:
     description: "Talos perf-reftest"
     suite: talos
@@ -1448,17 +1434,16 @@ talos-perf-reftest:
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 default:
                     - talos/linux_config.py
-                    - remove_executables.py
         extra-options:
             - --suite=perf-reftest
 
 talos-svgr:
     description: "Talos svgr"
     suite: talos
     try-name: svgr
     treeherder-symbol: tc-T(s)
@@ -1469,21 +1454,19 @@ talos-svgr:
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
-                    - remove_executables.py
                     - talos/mac_config.py
                 default:
                     - talos/linux_config.py
-                    - remove_executables.py
         extra-options:
             - --suite=svgr
             - --add-option
             - --webServer,localhost
 
 talos-tp5o:
     description: "Talos tp5o"
     suite: talos
@@ -1496,21 +1479,19 @@ talos-tp5o:
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
-                    - remove_executables.py
                     - talos/mac_config.py
                 default:
                     - talos/linux_config.py
-                    - remove_executables.py
         extra-options:
             - --suite=tp5o
             - --add-option
             - --webServer,localhost
 
 web-platform-tests:
     description: "Web platform test run"
     suite: web-platform-tests
--- a/testing/mozharness/configs/talos/linux_config.py
+++ b/testing/mozharness/configs/talos/linux_config.py
@@ -5,31 +5,39 @@ PYTHON = '/tools/buildbot/bin/python'
 VENV_PATH = '%s/build/venv' % os.getcwd()
 if platform.architecture()[0] == '64bit':
     TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux64/releng.manifest"
     MINIDUMP_STACKWALK_PATH = "linux64-minidump_stackwalk"
 else:
     TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux32/releng.manifest"
     MINIDUMP_STACKWALK_PATH = "linux32-minidump_stackwalk"
 
+exes = {
+    'tooltool.py': "/tools/tooltool.py",
+}
+
+# this Python only exists on Buildbot slaves, not on taskcluster workers where both
+# Python and virtualenv can be found in $PATH
+if os.path.exists(PYTHON):
+    exes.update({
+        'python': PYTHON,
+        'virtualenv': [PYTHON, '/tools/misc-python/virtualenv.py'],
+    })
+
 config = {
     "log_name": "talos",
     "buildbot_json_path": "buildprops.json",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
     "pip_index": False,
-    "exes": {
-        'python': PYTHON,
-        'virtualenv': [PYTHON, '/tools/misc-python/virtualenv.py'],
-        'tooltool.py': "/tools/tooltool.py",
-    },
+    "exes": exes,
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
         "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",
         "install",