jjb
/
jenkins-job-builder
Code Issues Proposed changes

Update build_blocker to make use of convert_mapping_to_xml() 

Change-Id: I104bbfce6b90f8ce62f28b75230ea0e86a5e2295
This commit is contained in:
Yolande Amate 2017-06-23 02:59:57 +01:00 committed by Thanh Ha
parent 1aa3f9895c
commit 7ebe789791
No known key found for this signature in database
GPG Key ID: B0CB27E00DA095AA
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
jenkins_jobs/modules/properties.py
View File

@ -558,28 +558,19 @@ def build_blocker(registry, xml_parent, data):
raise JenkinsJobsException('blocking-jobs field is missing') raise JenkinsJobsException('blocking-jobs field is missing')
elif data.get('blocking-jobs', None) is None: elif data.get('blocking-jobs', None) is None:
raise JenkinsJobsException('blocking-jobs list must not be empty') raise JenkinsJobsException('blocking-jobs list must not be empty')
XML.SubElement(blocker, 'useBuildBlocker').text = str(
data.get('use-build-blocker', True)).lower()
jobs = '' jobs = ''
for value in data['blocking-jobs']: for value in data['blocking-jobs']:
jobs = jobs + value + '\n' jobs = jobs + value + '\n'
XML.SubElement(blocker, 'blockingJobs').text = jobs mapping = [
('use-build-blocker', 'useBuildBlocker', True),
block_level_list = ('GLOBAL', 'NODE') ('', 'blockingJobs', jobs),
block_level = data.get('block-level', 'GLOBAL') ('blocking-level', 'blockLevel', 'GLOBAL', ('GLOBAL', 'NODE')),
if block_level not in block_level_list: ('queue-scanning', 'scanQueueFor', 'DISABLED',
raise InvalidAttributeError('block-level', ('DISABLED', 'ALL', 'BUILDABLE')),
block_level, ]
block_level_list) helpers.convert_mapping_to_xml(
XML.SubElement(blocker, 'blockLevel').text = block_level blocker, data, mapping, fail_required=True)
queue_scanning_list = ('DISABLED', 'ALL', 'BUILDABLE')
queue_scanning = data.get('queue-scanning', 'DISABLED')
if queue_scanning not in queue_scanning_list:
raise InvalidAttributeError('queue-scanning',
queue_scanning,
queue_scanning_list)
XML.SubElement(blocker, 'scanQueueFor').text = queue_scanning
def copyartifact(registry, xml_parent, data): def copyartifact(registry, xml_parent, data):