Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1357753: set correct virtualenv, python paths; r=jlund

Browse Source 
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

--HG--
extra : rebase_source : 9482321128b5d8da085bd38e088649c88ea6294c
This commit is contained in:
Dustin J. Mitchell 2017-05-10 20:24:08 +00:00
parent 3fdb2573d7
commit 6e11c532d5
2 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
taskcluster/ci/test/tests.yml
View File

@ -1235,11 +1235,9 @@ talos-chrome:
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
@ -1262,11 +1260,9 @@ talos-dromaeojs:
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
@ -1289,11 +1285,9 @@ talos-g1:
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
@ -1317,11 +1311,9 @@ talos-g2:
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
@ -1344,11 +1336,9 @@ talos-g3:
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
@ -1371,11 +1361,9 @@ talos-g4:
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
@ -1425,11 +1413,9 @@ talos-other:
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
@ -1453,7 +1439,6 @@ talos-perf-reftest:
by-test-platform:
default:
- talos/linux_config.py
- remove_executables.py
extra-options:
- --suite=perf-reftest
@ -1474,11 +1459,9 @@ talos-svgr:
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
@ -1501,11 +1484,9 @@ talos-tp5o:
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

18
testing/mozharness/configs/talos/linux_config.py
View File

@ -10,6 +10,18 @@ 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",
@ -20,11 +32,7 @@ config = {
"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",