Merge "delivery-pipeline: support task description template"

This commit is contained in:
Jenkins 2015-12-12 16:40:19 +00:00 committed by Gerrit Code Review
commit 15e06f9586
4 changed files with 7 additions and 0 deletions

View File

@ -579,6 +579,8 @@ def delivery_pipeline(parser, xml_parent, data):
Requires the Jenkins :jenkins-wiki:`Delivery Pipeline Plugin Requires the Jenkins :jenkins-wiki:`Delivery Pipeline Plugin
<Delivery+Pipeline+Plugin>`. <Delivery+Pipeline+Plugin>`.
:arg str description: task description template for this job
(default: '')
:arg str stage: Name of the stage for this job (default: '') :arg str stage: Name of the stage for this job (default: '')
:arg str task: Name of the task for this job (default: '') :arg str task: Name of the task for this job (default: '')
@ -593,6 +595,8 @@ def delivery_pipeline(parser, xml_parent, data):
'PipelineProperty') 'PipelineProperty')
XML.SubElement(pipeline, 'stageName').text = data.get('stage', '') XML.SubElement(pipeline, 'stageName').text = data.get('stage', '')
XML.SubElement(pipeline, 'taskName').text = data.get('task', '') XML.SubElement(pipeline, 'taskName').text = data.get('task', '')
XML.SubElement(pipeline, 'descriptionTemplate').text = str(
data.get('description', ''))
def zeromq_event(parser, xml_parent, data): def zeromq_event(parser, xml_parent, data):

View File

@ -4,6 +4,7 @@
<se.diabol.jenkins.pipeline.PipelineProperty> <se.diabol.jenkins.pipeline.PipelineProperty>
<stageName>Stage</stageName> <stageName>Stage</stageName>
<taskName>Task</taskName> <taskName>Task</taskName>
<descriptionTemplate>Task-Description</descriptionTemplate>
</se.diabol.jenkins.pipeline.PipelineProperty> </se.diabol.jenkins.pipeline.PipelineProperty>
</properties> </properties>
</project> </project>

View File

@ -2,3 +2,4 @@ properties:
- delivery-pipeline: - delivery-pipeline:
stage: Stage stage: Stage
task: Task task: Task
description: Task-Description

View File

@ -4,6 +4,7 @@
<se.diabol.jenkins.pipeline.PipelineProperty> <se.diabol.jenkins.pipeline.PipelineProperty>
<stageName/> <stageName/>
<taskName/> <taskName/>
<descriptionTemplate/>
</se.diabol.jenkins.pipeline.PipelineProperty> </se.diabol.jenkins.pipeline.PipelineProperty>
</properties> </properties>
</project> </project>