Skip to content
Snippets Groups Projects
Commit 6603a2d2 authored by Christian Goetze's avatar Christian Goetze
Browse files

Reduce job count for linux builds to something the build farm can survive

parent 87776b19
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 3 deletions
indra/develop.py
+ 7
− 3
View file @ 6603a2d2
...@@ -383,16 +383,20 @@ def mk_distcc_hosts(basename, range, num_cpus): ...@@ -383,16 +383,20 @@ def mk_distcc_hosts(basename, range, num_cpus):
if job_count is None: if job_count is None:
hosts, job_count = count_distcc_hosts() hosts, job_count = count_distcc_hosts()
hostname = socket.gethostname()
if hosts == 1: if hosts == 1:
hostname = socket.gethostname()
if hostname.startswith('station'): if hostname.startswith('station'):
hosts, job_count = mk_distcc_hosts('station', 36, 2) hosts, job_count = mk_distcc_hosts('station', 36, 2)
os.environ['DISTCC_HOSTS'] = hosts os.environ['DISTCC_HOSTS'] = hosts
if hostname.startswith('eniac'): if hostname.startswith('eniac'):
hosts, job_count = mk_distcc_hosts('eniac', 71, 2) hosts, job_count = mk_distcc_hosts('eniac', 71, 2)
os.environ['DISTCC_HOSTS'] = hosts os.environ['DISTCC_HOSTS'] = hosts
if job_count > 12: if hostname.startswith('build'):
job_count = 12; max_jobs = 6
else:
max_jobs = 12
if job_count > max_jobs:
job_count = max_jobs;
opts.extend(['-j', str(job_count)]) opts.extend(['-j', str(job_count)])
if targets: if targets:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment