jjb/jenkins-job-builder
Code Issues Proposed changes

Merge "Add views and jobs only options for update"

Browse Source
This commit is contained in:
Zuul
2018-02-23 21:25:05 +00:00
committed by Gerrit Code Review
parent aa74f8d67c ad61af1670
commit 2da47d901b
2 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doc/source/execution.rst
View File

@@ -195,6 +195,13 @@ use::
jenkins-jobs update --workers 0 /path/to/defs jenkins-jobs update --workers 0 /path/to/defs
To update only views or only jobs, simply add the argument
--views-only or --jobs-only after the command::
jenkins-jobs update --views-only Foo-view
jenkins-jobs update --jobs-only Foo-job
Passing Multiple Paths Passing Multiple Paths
^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^
It is possible to pass multiple paths to JJB using colons as a path separator on It is possible to pass multiple paths to JJB using colons as a path separator on

38
jenkins_jobs/cli/subcommand/update.py
View File

@@ -72,6 +72,18 @@ class UpdateSubCommand(base.BaseSubCommand):
dest='n_workers', dest='n_workers',
help="number of workers to use, 0 for autodetection and 1 " help="number of workers to use, 0 for autodetection and 1 "
"for just one worker.") "for just one worker.")
update.add_argument(
'-j', '--jobs-only',
action='store_true', dest='add_jobs',
default=False,
help='update only jobs'
)
update.add_argument(
'-v', '--views-only',
action='store_true', dest='add_views',
default=False,
help='update only views'
)
def _generate_xmljobs(self, options, jjb_config=None): def _generate_xmljobs(self, options, jjb_config=None):
builder = JenkinsManager(jjb_config) builder = JenkinsManager(jjb_config)
@@ -104,6 +116,10 @@ class UpdateSubCommand(base.BaseSubCommand):
def execute(self, options, jjb_config): def execute(self, options, jjb_config):
if options.add_jobs and options.add_views:
raise JenkinsJobsException(
'"--views-only" and "--jobs-only" cannot be used together.')
if options.n_workers < 0: if options.n_workers < 0:
raise JenkinsJobsException( raise JenkinsJobsException(
'Number of workers must be equal or greater than 0') 'Number of workers must be equal or greater than 0')
@@ -111,13 +127,21 @@ class UpdateSubCommand(base.BaseSubCommand):
builder, xml_jobs, xml_views = self._generate_xmljobs( builder, xml_jobs, xml_views = self._generate_xmljobs(
options, jjb_config) options, jjb_config)
jobs, num_updated_jobs = builder.update_jobs( if options.add_jobs:
xml_jobs, n_workers=options.n_workers) jobs, num_updated_jobs = builder.update_jobs(
logger.info("Number of jobs updated: %d", num_updated_jobs) xml_jobs, n_workers=options.n_workers)
logger.info("Number of jobs updated: %d", num_updated_jobs)
views, num_updated_views = builder.update_views( elif options.add_views:
xml_views, n_workers=options.n_workers) views, num_updated_views = builder.update_views(
logger.info("Number of views updated: %d", num_updated_views) xml_views, n_workers=options.n_workers)
logger.info("Number of views updated: %d", num_updated_views)
else:
jobs, num_updated_jobs = builder.update_jobs(
xml_jobs, n_workers=options.n_workers)
logger.info("Number of jobs updated: %d", num_updated_jobs)
views, num_updated_views = builder.update_views(
xml_views, n_workers=options.n_workers)
logger.info("Number of views updated: %d", num_updated_views)
keep_jobs = [job.name for job in xml_jobs] keep_jobs = [job.name for job in xml_jobs]
if options.delete_old: if options.delete_old: