RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-29 14:34:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow setting results_email in teuthology.yaml

Browse Source 
(Instead of passing --email to teuthology-suite)

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
This commit is contained in:
Zack Cerza 2014-07-02 18:39:47 -06:00
parent 34a7b31823
commit dbadcd0d56
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/suite.py
View File

@ -50,7 +50,9 @@ Standard arguments:
Scheduler arguments:
--owner <owner> Job owner
-e <email>, --email <email>
When tests finish or time out, send an email here
When tests finish or time out, send an email
here. May also be specified in ~/.teuthology.yaml
as 'results_email'
-N <num>, --num <num> Number of times to run/queue the job
[default: 1]
-l <jobs>, --limit <jobs> Queue at most this many jobs

10
teuthology/suite.py
View File

@ -48,7 +48,6 @@ def main(args):
owner = args['--owner']
email = args['--email']
if email:
config.email_specified = True
config.results_email = email
timeout = args['--timeout']
@ -75,7 +74,6 @@ def main(args):
machine_type=machine_type,
suite_repo_path=suite_repo_path,
base_yaml_paths=base_yaml_paths,
email=email,
priority=priority,
limit=limit,
num=num,
@ -219,14 +217,15 @@ def create_initial_config(nice_suite, ceph_branch, teuthology_branch,
def prepare_and_schedule(owner, name, suite, machine_type, suite_repo_path,
base_yaml_paths, email, priority, limit, num, timeout,
base_yaml_paths, priority, limit, num, timeout,
dry_run, verbose):
"""
Puts together some "base arguments" with which to execute
teuthology-schedule for each job, then passes them and other parameters to
schedule_suite(). Finally, schedules a "last-in-suite" job that sends an
email to the specified address (if one is specified).
email to the specified address (if one is configured).
"""
email = config.results_email
arch = get_arch(machine_type)
base_args = [
@ -258,8 +257,7 @@ def prepare_and_schedule(owner, name, suite, machine_type, suite_repo_path,
if email and num_jobs:
arg = copy.deepcopy(base_args)
arg.append('--last-in-suite')
if email:
arg.extend(['--email', email])
arg.extend(['--email', email])
if timeout:
arg.extend(['--timeout', timeout])
if dry_run: