Skip to content

Commit

Permalink
Add extra-jobs.yaml
Browse files Browse the repository at this point in the history
Extra jobs can be defined in this file, e.g. by external tools.
  • Loading branch information
flupke committed Nov 30, 2017
1 parent bde0d81 commit e5252d9
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
3 changes: 3 additions & 0 deletions doc/jobs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ default_context:
context
Optional, a mapping containing extra context overriding
``default_context``.

Extra jobs can be defined in the ``extra-jobs.yaml`` file. This can be
useful in scenarios where jobs are generated by external tools.
18 changes: 15 additions & 3 deletions jenskipper/repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ def get_jobs_defs_fname(base_dir):
return op.join(base_dir, 'jobs.yaml')


def _get_extra_jobs_defs_fname(base_dir):
return op.join(base_dir, 'extra-jobs.yaml')


def parse_jobs_defs(fp, default_contexts):
jobs_defs = yaml.safe_load(fp)
return {k: _normalize_job_def(v, default_contexts)
Expand All @@ -77,10 +81,18 @@ def get_jobs_defs(base_dir):
Return a dict indexed by job name containing jobs properties (template,
context, etc...).
'''
fname = get_jobs_defs_fname(base_dir)
default_contexts = get_default_contexts(base_dir)
with open(fname) as fp:
return parse_jobs_defs(fp, default_contexts)
jobs_fname = get_jobs_defs_fname(base_dir)
with open(jobs_fname) as fp:
jobs_defs = parse_jobs_defs(fp, default_contexts)
extra_jobs_fname = _get_extra_jobs_defs_fname(base_dir)
if op.exists(extra_jobs_fname):
with open(extra_jobs_fname) as fp:
extra_jobs_defs = parse_jobs_defs(fp, default_contexts)
else:
extra_jobs_defs = {}
jobs_defs.update(extra_jobs_defs)
return jobs_defs


def get_default_contexts_fname(base_dir):
Expand Down

0 comments on commit e5252d9

Please sign in to comment.