jjb/jenkins-job-builder
Code Issues Proposed changes

Allow raw XML at project top-level

Browse Source 
This allows a `raw` section at the top-level of a job definition.

Change-Id: Id76bbfbde8df49b221fcd1198354ba8b5ce9fb02
This commit is contained in:
Jonathan Perret 2015-10-07 18:17:47 +02:00
parent 556deebe25
commit a63d3c8d11
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jenkins_jobs/modules/general.py
View File

@ -95,6 +95,10 @@ Example:
history. It adds the ``logrotate`` attribute to the :ref:`Job` history. It adds the ``logrotate`` attribute to the :ref:`Job`
definition. All logrotate attributes default to "-1" (keep forever). definition. All logrotate attributes default to "-1" (keep forever).
* **raw**:
If present, this section should contain a single **xml** entry. This XML
will be inserted at the top-level of the :ref:`Job` definition.
""" """
import xml.etree.ElementTree as XML import xml.etree.ElementTree as XML
@ -171,6 +175,9 @@ class General(jenkins_jobs.modules.base.Base):
lr_anum = XML.SubElement(lr_xml, 'artifactNumToKeep') lr_anum = XML.SubElement(lr_xml, 'artifactNumToKeep')
lr_anum.text = str(logrotate.get('artifactNumToKeep', -1)) lr_anum.text = str(logrotate.get('artifactNumToKeep', -1))
if 'raw' in data:
raw(parser, xml, data['raw'])
def raw(parser, xml_parent, data): def raw(parser, xml_parent, data):
# documented in definition.rst since includes and docs is not working well # documented in definition.rst since includes and docs is not working well

13
tests/general/fixtures/raw-xml-toplevel.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<project>
<actions/>
<keepDependencies>false</keepDependencies>
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<concurrentBuild>false</concurrentBuild>
<canRoam>true</canRoam>
<createdByJenkinsAutojobs>
<ref>refs/heads/branch</ref>
<tag>feature</tag>
</createdByJenkinsAutojobs>
</project>

3
tests/general/fixtures/raw-xml-toplevel.yaml Normal file
View File

@ -0,0 +1,3 @@
raw:
xml: |
<createdByJenkinsAutojobs><ref>refs/heads/branch</ref><tag>feature</tag></createdByJenkinsAutojobs>