Skip to content
Snippets Groups Projects
Commit 9ba10d8a authored by matt-kwong's avatar matt-kwong Committed by GitHub
Browse files

Merge pull request #8542 from matt-kwong/decrease-test-time 

Add --inner_jobs parameter to run_tests_matrix.py
parents da1d2ef0 fef9896c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tools/run_tests/run_tests_matrix.py
+ 43
− 24
View file @ 9ba10d8a
...@@ -46,16 +46,16 @@ os.chdir(_ROOT) ...@@ -46,16 +46,16 @@ os.chdir(_ROOT)
_RUNTESTS_TIMEOUT = 4*60*60 _RUNTESTS_TIMEOUT = 4*60*60
# Number of jobs assigned to each run_tests.py instance # Number of jobs assigned to each run_tests.py instance
_INNER_JOBS = 2 _DEFAULT_INNER_JOBS = 2
def _docker_jobspec(name, runtests_args=[]): def _docker_jobspec(name, runtests_args=[], inner_jobs=_DEFAULT_INNER_JOBS):
"""Run a single instance of run_tests.py in a docker container""" """Run a single instance of run_tests.py in a docker container"""
test_job = jobset.JobSpec( test_job = jobset.JobSpec(
cmdline=['python', 'tools/run_tests/run_tests.py', cmdline=['python', 'tools/run_tests/run_tests.py',
'--use_docker', '--use_docker',
'-t', '-t',
'-j', str(_INNER_JOBS), '-j', str(inner_jobs),
'-x', 'report_%s.xml' % name, '-x', 'report_%s.xml' % name,
'--report_suite_name', '%s' % name] + runtests_args, '--report_suite_name', '%s' % name] + runtests_args,
shortname='run_tests_%s' % name, shortname='run_tests_%s' % name,
...@@ -63,7 +63,7 @@ def _docker_jobspec(name, runtests_args=[]): ...@@ -63,7 +63,7 @@ def _docker_jobspec(name, runtests_args=[]):
return test_job return test_job
def _workspace_jobspec(name, runtests_args=[], workspace_name=None): def _workspace_jobspec(name, runtests_args=[], workspace_name=None, inner_jobs=_DEFAULT_INNER_JOBS):
"""Run a single instance of run_tests.py in a separate workspace""" """Run a single instance of run_tests.py in a separate workspace"""
if not workspace_name: if not workspace_name:
workspace_name = 'workspace_%s' % name workspace_name = 'workspace_%s' % name
...@@ -71,7 +71,7 @@ def _workspace_jobspec(name, runtests_args=[], workspace_name=None): ...@@ -71,7 +71,7 @@ def _workspace_jobspec(name, runtests_args=[], workspace_name=None):
test_job = jobset.JobSpec( test_job = jobset.JobSpec(
cmdline=['tools/run_tests/run_tests_in_workspace.sh', cmdline=['tools/run_tests/run_tests_in_workspace.sh',
'-t', '-t',
'-j', str(_INNER_JOBS), '-j', str(inner_jobs),
'-x', '../report_%s.xml' % name, '-x', '../report_%s.xml' % name,
'--report_suite_name', '%s' % name] + runtests_args, '--report_suite_name', '%s' % name] + runtests_args,
environ=env, environ=env,
...@@ -82,7 +82,8 @@ def _workspace_jobspec(name, runtests_args=[], workspace_name=None): ...@@ -82,7 +82,8 @@ def _workspace_jobspec(name, runtests_args=[], workspace_name=None):
def _generate_jobs(languages, configs, platforms, def _generate_jobs(languages, configs, platforms,
arch=None, compiler=None, arch=None, compiler=None,
labels=[], extra_args=[]): labels=[], extra_args=[],
inner_jobs=_DEFAULT_INNER_JOBS):
result = [] result = []
for language in languages: for language in languages:
for platform in platforms: for platform in platforms:
...@@ -97,68 +98,75 @@ def _generate_jobs(languages, configs, platforms, ...@@ -97,68 +98,75 @@ def _generate_jobs(languages, configs, platforms,
runtests_args += extra_args runtests_args += extra_args
if platform == 'linux': if platform == 'linux':
job = _docker_jobspec(name=name, runtests_args=runtests_args) job = _docker_jobspec(name=name, runtests_args=runtests_args, inner_jobs=inner_jobs)
else: else:
job = _workspace_jobspec(name=name, runtests_args=runtests_args) job = _workspace_jobspec(name=name, runtests_args=runtests_args, inner_jobs=inner_jobs)
job.labels = [platform, config, language] + labels job.labels = [platform, config, language] + labels
result.append(job) result.append(job)
return result return result
def _create_test_jobs(extra_args=[]): def _create_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS):
test_jobs = [] test_jobs = []
# supported on linux only # supported on linux only
test_jobs += _generate_jobs(languages=['sanity', 'php7'], test_jobs += _generate_jobs(languages=['sanity', 'php7'],
configs=['dbg', 'opt'], configs=['dbg', 'opt'],
platforms=['linux'], platforms=['linux'],
labels=['basictests'], labels=['basictests'],
extra_args=extra_args) extra_args=extra_args,
inner_jobs=inner_jobs)
# supported on all platforms. # supported on all platforms.
test_jobs += _generate_jobs(languages=['c', 'csharp', 'node', 'python'], test_jobs += _generate_jobs(languages=['c', 'csharp', 'node', 'python'],
configs=['dbg', 'opt'], configs=['dbg', 'opt'],
platforms=['linux', 'macos', 'windows'], platforms=['linux', 'macos', 'windows'],
labels=['basictests'], labels=['basictests'],
extra_args=extra_args) extra_args=extra_args,
inner_jobs=inner_jobs)
# supported on linux and mac. # supported on linux and mac.
test_jobs += _generate_jobs(languages=['c++', 'ruby', 'php'], test_jobs += _generate_jobs(languages=['c++', 'ruby', 'php'],
configs=['dbg', 'opt'], configs=['dbg', 'opt'],
platforms=['linux', 'macos'], platforms=['linux', 'macos'],
labels=['basictests'], labels=['basictests'],
extra_args=extra_args) extra_args=extra_args,
inner_jobs=inner_jobs)
# supported on mac only. # supported on mac only.
test_jobs += _generate_jobs(languages=['objc'], test_jobs += _generate_jobs(languages=['objc'],
configs=['dbg', 'opt'], configs=['dbg', 'opt'],
platforms=['macos'], platforms=['macos'],
labels=['basictests'], labels=['basictests'],
extra_args=extra_args) extra_args=extra_args,
inner_jobs=inner_jobs)
# sanitizers # sanitizers
test_jobs += _generate_jobs(languages=['c'], test_jobs += _generate_jobs(languages=['c'],
configs=['msan', 'asan', 'tsan'], configs=['msan', 'asan', 'tsan'],
platforms=['linux'], platforms=['linux'],
labels=['sanitizers'], labels=['sanitizers'],
extra_args=extra_args) extra_args=extra_args,
inner_jobs=inner_jobs)
test_jobs += _generate_jobs(languages=['c++'], test_jobs += _generate_jobs(languages=['c++'],
configs=['asan', 'tsan'], configs=['asan', 'tsan'],
platforms=['linux'], platforms=['linux'],
labels=['sanitizers'], labels=['sanitizers'],
extra_args=extra_args) extra_args=extra_args,
inner_jobs=inner_jobs)
# libuv tests # libuv tests
test_jobs += _generate_jobs(languages=['c'], test_jobs += _generate_jobs(languages=['c'],
configs=['dbg', 'opt'], configs=['dbg', 'opt'],
platforms=['linux'], platforms=['linux'],
labels=['libuv'], labels=['libuv'],
extra_args=extra_args + ['--iomgr_platform=uv']) extra_args=extra_args + ['--iomgr_platform=uv'],
inner_jobs=inner_jobs)
return test_jobs return test_jobs
def _create_portability_test_jobs(extra_args=[]): def _create_portability_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS):
test_jobs = [] test_jobs = []
# portability C x86 # portability C x86
test_jobs += _generate_jobs(languages=['c'], test_jobs += _generate_jobs(languages=['c'],
...@@ -167,7 +175,8 @@ def _create_portability_test_jobs(extra_args=[]): ...@@ -167,7 +175,8 @@ def _create_portability_test_jobs(extra_args=[]):
arch='x86', arch='x86',
compiler='default', compiler='default',
labels=['portability'], labels=['portability'],
extra_args=extra_args) extra_args=extra_args,
inner_jobs=inner_jobs)
# portability C and C++ on x64 # portability C and C++ on x64
for compiler in ['gcc4.4', 'gcc4.6', 'gcc5.3', for compiler in ['gcc4.4', 'gcc4.6', 'gcc5.3',
...@@ -178,7 +187,8 @@ def _create_portability_test_jobs(extra_args=[]): ...@@ -178,7 +187,8 @@ def _create_portability_test_jobs(extra_args=[]):
arch='x64', arch='x64',
compiler=compiler, compiler=compiler,
labels=['portability'], labels=['portability'],
extra_args=extra_args) extra_args=extra_args,
inner_jobs=inner_jobs)
# portability C on Windows # portability C on Windows
for arch in ['x86', 'x64']: for arch in ['x86', 'x64']:
...@@ -189,7 +199,8 @@ def _create_portability_test_jobs(extra_args=[]): ...@@ -189,7 +199,8 @@ def _create_portability_test_jobs(extra_args=[]):
arch=arch, arch=arch,
compiler=compiler, compiler=compiler,
labels=['portability'], labels=['portability'],
extra_args=extra_args) extra_args=extra_args,
inner_jobs=inner_jobs)
test_jobs += _generate_jobs(languages=['python'], test_jobs += _generate_jobs(languages=['python'],
configs=['dbg'], configs=['dbg'],
...@@ -197,7 +208,8 @@ def _create_portability_test_jobs(extra_args=[]): ...@@ -197,7 +208,8 @@ def _create_portability_test_jobs(extra_args=[]):
arch='default', arch='default',
compiler='python3.4', compiler='python3.4',
labels=['portability'], labels=['portability'],
extra_args=extra_args) extra_args=extra_args,
inner_jobs=inner_jobs)
test_jobs += _generate_jobs(languages=['csharp'], test_jobs += _generate_jobs(languages=['csharp'],
configs=['dbg'], configs=['dbg'],
...@@ -205,7 +217,8 @@ def _create_portability_test_jobs(extra_args=[]): ...@@ -205,7 +217,8 @@ def _create_portability_test_jobs(extra_args=[]):
arch='default', arch='default',
compiler='coreclr', compiler='coreclr',
labels=['portability'], labels=['portability'],
extra_args=extra_args) extra_args=extra_args,
inner_jobs=inner_jobs)
return test_jobs return test_jobs
...@@ -220,7 +233,7 @@ def _allowed_labels(): ...@@ -220,7 +233,7 @@ def _allowed_labels():
argp = argparse.ArgumentParser(description='Run a matrix of run_tests.py tests.') argp = argparse.ArgumentParser(description='Run a matrix of run_tests.py tests.')
argp.add_argument('-j', '--jobs', argp.add_argument('-j', '--jobs',
default=multiprocessing.cpu_count()/_INNER_JOBS, default=multiprocessing.cpu_count()/_DEFAULT_INNER_JOBS,
type=int, type=int,
help='Number of concurrent run_tests.py instances.') help='Number of concurrent run_tests.py instances.')
argp.add_argument('-f', '--filter', argp.add_argument('-f', '--filter',
...@@ -249,15 +262,21 @@ argp.add_argument('--base_branch', ...@@ -249,15 +262,21 @@ argp.add_argument('--base_branch',
default='origin/master', default='origin/master',
type=str, type=str,
help='Branch that pull request is requesting to merge into') help='Branch that pull request is requesting to merge into')
argp.add_argument('--inner_jobs',
default=_DEFAULT_INNER_JOBS,
type=int,
help='Number of jobs in each run_tests.py instance')
args = argp.parse_args() args = argp.parse_args()
extra_args = [] extra_args = []
if args.build_only: if args.build_only:
extra_args.append('--build_only') extra_args.append('--build_only')
if args.force_default_poller: if args.force_default_poller:
extra_args.append('--force_default_poller') extra_args.append('--force_default_poller')
all_jobs = _create_test_jobs(extra_args=extra_args) + _create_portability_test_jobs(extra_args=extra_args) all_jobs = _create_test_jobs(extra_args=extra_args, inner_jobs=args.inner_jobs) + \
_create_portability_test_jobs(extra_args=extra_args, inner_jobs=args.inner_jobs)
jobs = [] jobs = []
for job in all_jobs: for job in all_jobs:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment