jjb
/
jenkins-job-builder
Code Issues Proposed changes

Include view url in logs when possible 

Makes view logging similar to job one so URLs are printed
inside the logs.

Also assured that URLs for both, views and jobs, are
ending with slash as thats the what Jenkins expected format.

Change-Id: Id34a25b47b4f584f07cc2dc2039cc1a49ab49038
This commit is contained in:
Sorin Sbarnea 2018-04-06 11:36:15 +01:00 committed by Thanh Ha
parent 7356ab2ffb
commit cd90a7e2a5
No known key found for this signature in database
GPG Key ID: B0CB27E00DA095AA
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jenkins_jobs/builder.py
View File

@ -108,10 +108,20 @@ class JenkinsManager(object):
# returns job name or url based on config option
if self._jjb_config.builder['print_job_urls']:
return self._jjb_config.jenkins['url'] + \
'/job/' + '/job/'.join(job_name.split('/'))
'/job/' + '/job/'.join(job_name.split('/')) + '/'
else:
return job_name
def _view_format(self, view_name):
# returns job name or url based on config option
if self._jjb_config.builder['print_job_urls']:
parts = view_name.split('/')
return self._jjb_config.jenkins['url'] + \
''.join(['/job/' + item for item in parts[:-1]]) + \
'/view/' + parts[-1] + '/'
else:
return view_name
def update_job(self, job_name, xml):
if self.is_job(job_name):
logger.info("Reconfiguring jenkins job {0}".format(
@ -376,10 +386,12 @@ class JenkinsManager(object):
def update_view(self, view_name, xml):
if self.is_view(view_name):
logger.info("Reconfiguring jenkins view {0}".format(view_name))
logger.info("Reconfiguring jenkins view {0}".format(
self._view_format(view_name)))
self.jenkins.reconfig_view(view_name, xml)
else:
logger.info("Creating jenkins view {0}".format(view_name))
logger.info("Creating jenkins view {0}".format(
self._view_format(view_name)))
self.jenkins.create_view(view_name, xml)
def update_views(self, xml_views, output=None, n_workers=None,