mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-19 00:05:36 +00:00
Bug 1436037 - [ci] Run mozbase and mozlint python-test tasks on OSX, r=jmaher
Differential Revision: https://phabricator.services.mozilla.com/D14901 --HG-- extra : moz-landing-system : lando
This commit is contained in:
parent
828485d8db
commit
fea1d97f08
@ -4,6 +4,7 @@ job-defaults:
|
|||||||
worker-type:
|
worker-type:
|
||||||
by-platform:
|
by-platform:
|
||||||
linux64.*: aws-provisioner-v1/gecko-t-linux-xlarge
|
linux64.*: aws-provisioner-v1/gecko-t-linux-xlarge
|
||||||
|
macosx64.*: releng-hardware/gecko-t-osx-1010
|
||||||
windows10-64.*: aws-provisioner-v1/gecko-t-win10-64
|
windows10-64.*: aws-provisioner-v1/gecko-t-win10-64
|
||||||
worker:
|
worker:
|
||||||
by-platform:
|
by-platform:
|
||||||
@ -97,6 +98,7 @@ mozbase:
|
|||||||
description: testing/mozbase unit tests
|
description: testing/mozbase unit tests
|
||||||
platform:
|
platform:
|
||||||
- linux64/opt
|
- linux64/opt
|
||||||
|
- macosx64/opt
|
||||||
- windows10-64/opt
|
- windows10-64/opt
|
||||||
python-version: [2, 3]
|
python-version: [2, 3]
|
||||||
treeherder:
|
treeherder:
|
||||||
@ -126,6 +128,7 @@ mozlint:
|
|||||||
description: python/mozlint unit tests
|
description: python/mozlint unit tests
|
||||||
platform:
|
platform:
|
||||||
- linux64/opt
|
- linux64/opt
|
||||||
|
- macosx64/opt
|
||||||
- windows10-64/opt
|
- windows10-64/opt
|
||||||
python-version: [2]
|
python-version: [2]
|
||||||
treeherder:
|
treeherder:
|
||||||
|
@ -35,10 +35,15 @@ defaults = {
|
|||||||
@run_job_using('generic-worker', 'python-test', schema=python_test_schema, defaults=defaults)
|
@run_job_using('generic-worker', 'python-test', schema=python_test_schema, defaults=defaults)
|
||||||
def configure_python_test(config, job, taskdesc):
|
def configure_python_test(config, job, taskdesc):
|
||||||
run = job['run']
|
run = job['run']
|
||||||
|
worker = job['worker']
|
||||||
|
|
||||||
|
if worker['os'] == 'macosx' and run['python-version'] == 3:
|
||||||
|
# OSX hosts can't seem to find python 3 on their own
|
||||||
|
run['python-version'] = '/usr/local/bin/python3'
|
||||||
|
|
||||||
# defer to the mach implementation
|
# defer to the mach implementation
|
||||||
run['mach'] = 'python-test --python {python-version} --subsuite {subsuite}'.format(**run)
|
run['mach'] = 'python-test --python {python-version} --subsuite {subsuite}'.format(**run)
|
||||||
run['using'] = 'mach'
|
run['using'] = 'mach'
|
||||||
del run['python-version']
|
del run['python-version']
|
||||||
del run['subsuite']
|
del run['subsuite']
|
||||||
configure_taskdesc_for_run(config, job, taskdesc, job['worker']['implementation'])
|
configure_taskdesc_for_run(config, job, taskdesc, worker['implementation'])
|
||||||
|
@ -2,6 +2,8 @@
|
|||||||
subsuite = mozbase
|
subsuite = mozbase
|
||||||
skip-if = python == 3
|
skip-if = python == 3
|
||||||
[test_binary.py]
|
[test_binary.py]
|
||||||
|
skip-if = os == "mac"
|
||||||
[test_install.py]
|
[test_install.py]
|
||||||
|
skip-if = os == "mac" # intermittent
|
||||||
[test_is_installer.py]
|
[test_is_installer.py]
|
||||||
[test_uninstall.py]
|
[test_uninstall.py]
|
||||||
|
@ -409,7 +409,7 @@ class TestMetadata(object):
|
|||||||
|
|
||||||
candidate_paths = set()
|
candidate_paths = set()
|
||||||
|
|
||||||
if any(self.is_wpt_path(path) for path in paths):
|
if flavor in (None, 'web-platform-tests') and any(self.is_wpt_path(p) for p in paths):
|
||||||
self.add_wpt_manifest_data()
|
self.add_wpt_manifest_data()
|
||||||
|
|
||||||
for path in sorted(paths):
|
for path in sorted(paths):
|
||||||
|
@ -3,5 +3,6 @@ subsuite = mozlint
|
|||||||
skip-if = python == 3
|
skip-if = python == 3
|
||||||
|
|
||||||
[test_eslint.py]
|
[test_eslint.py]
|
||||||
skip-if = os == "win" # node not installed on worker
|
skip-if = os == "win" || os == "mac" # node not installed on worker
|
||||||
[test_flake8.py]
|
[test_flake8.py]
|
||||||
|
skip-if = os == "mac" # pip unable to find 'flake8==3.5.0'
|
||||||
|
Loading…
Reference in New Issue
Block a user