jjb
/
jenkins-job-builder
Code Issues Proposed changes

Merge "Update openstack to use convert_mapping_to_xml()"

This commit is contained in:
Jenkins 2017-08-29 22:10:05 +00:00 committed by Gerrit Code Review
parent 6a7140f9a5 828baa7d3e
commit f2b01f7c5c
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jenkins_jobs/modules/wrappers.py
View File

@ -1139,23 +1139,17 @@ def openstack(registry, xml_parent, data):
instances_to_run = XML.SubElement(
instances_wrapper, tag_prefix + 'InstancesToRun')
try:
cloud_name = instance['cloud-name']
template_name = instance['template-name']
except KeyError as exception:
raise MissingAttributeError(exception.args[0])
XML.SubElement(instances_to_run, 'cloudName').text = cloud_name
instance_mapping = [('cloud-name', 'cloudName', None),
('count', 'count', 1)]
if instance.get('manual-template', False):
XML.SubElement(instances_to_run,
'manualTemplateName').text = template_name
instance_mapping.append(('template-name',
'manualTemplateName', None))
else:
XML.SubElement(instances_to_run,
'templateName').text = template_name
XML.SubElement(instances_to_run, 'count').text = str(
instance.get('count', 1))
instance_mapping.append(('template-name',
'templateName', None))
convert_mapping_to_xml(instances_to_run,
instance, instance_mapping, fail_required=True)
if data.get('single-use', False):
XML.SubElement(xml_parent, tag_prefix + 'JCloudsOneOffSlave')

4
tests/wrappers/fixtures/openstack001.xml
View File

@ -5,13 +5,13 @@
<instancesToRun>
<jenkins.plugins.openstack.compute.InstancesToRun>
<cloudName>mycloud1</cloudName>
<templateName>jenkins-dev-slave</templateName>
<count>1</count>
<templateName>jenkins-dev-slave</templateName>
</jenkins.plugins.openstack.compute.InstancesToRun>
<jenkins.plugins.openstack.compute.InstancesToRun>
<cloudName>mycloud2</cloudName>
<manualTemplateName>jenkins-test-slave</manualTemplateName>
<count>2</count>
<manualTemplateName>jenkins-test-slave</manualTemplateName>
</jenkins.plugins.openstack.compute.InstancesToRun>
</instancesToRun>
</jenkins.plugins.openstack.compute.JCloudsBuildWrapper>

2
tests/wrappers/fixtures/openstack002.xml
View File

@ -5,8 +5,8 @@
<instancesToRun>
<jenkins.plugins.openstack.compute.InstancesToRun>
<cloudName>mycloud1</cloudName>
<templateName>jenkins-dev-slave</templateName>
<count>1</count>
<templateName>jenkins-dev-slave</templateName>
</jenkins.plugins.openstack.compute.InstancesToRun>
</instancesToRun>
</jenkins.plugins.openstack.compute.JCloudsBuildWrapper>