jjb
/
jenkins-job-builder
Code Issues Proposed changes

Only write EnvInject properties if they have been specified 

Change-Id: I98c23f378257ea286775452791ecc2d82de07b18
This commit is contained in:
Manuel Desbonnet 2012-09-19 08:28:35 +01:00
parent 467cae33a5
commit 49fece8487
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jenkins_jobs/modules/properties.py
View File

@ -113,16 +113,19 @@ def inject(parser, xml_parent, data):
inject = XML.SubElement(xml_parent,
'EnvInjectJobProperty')
info = XML.SubElement(inject, 'info')
XML.SubElement(info, 'propertiesFilePath').text = str(
data.get('properties-file', ''))
XML.SubElement(info, 'propertiesContent').text = str(
data.get('properties-content', ''))
XML.SubElement(info, 'scriptFilePath').text = str(
data.get('script-file', ''))
XML.SubElement(info, 'scriptContent').text = str(
data.get('script-content', ''))
XML.SubElement(info, 'groovyScriptContent').text = str(
data.get('groovy-content', ''))
# It seems like empty properties (e.g. <scriptFilePath/>) cause problems
# for the EnvInject plugin (EnvInject v1.5.3 on jenkins v1.464 at least).
# Inject only those properties that have been specified.
str_props = {'properties-file': 'propertiesFilePath',
'properties-content': 'propertiesContent',
'script-file': 'scriptFilePath',
'script-content': 'scriptContent',
'groovy-content': 'groovyScriptContent',
}
for p, xp in str_props.iteritems():
if p in data:
XML.SubElement(info, xp).text = str(data[p])
XML.SubElement(info, 'loadFilesFromMaster').text = str(
data.get('load-from-master', 'false')).lower()
XML.SubElement(inject, 'on').text = str(