jjb
/
jenkins-job-builder
Code Issues Proposed changes

Support for post-step-run-condition in Maven projects 

Change-Id: I87e1b58ad69330f3bb44070513ac90ec03b65cb4
This commit is contained in:
Somay Jain 2015-06-15 12:07:02 +05:30
parent 413c150815
commit 25a507ff8f
5 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jenkins_jobs/modules/project_maven.py
View File

@ -58,6 +58,9 @@ in the :ref:`Job` definition.
* **global-settings** (`str`): Path to custom maven global settings file.
It is possible to provide a ConfigFileProvider settings file as well
see CFP Example below. (optional)
* **post-step-run-condition** (`str`): Run the post-build steps only if the
build succeeds ('SUCCESS'), build succeeds or is unstable ('UNSTABLE'),
regardless of build result ('FAILURE'). (default 'FAILURE').
Requires the Jenkins `Config File Provider Plugin
<https://wiki.jenkins-ci.org/display/JENKINS/Config+File+Provider+Plugin>`_
@ -74,7 +77,9 @@ CFP Example:
import xml.etree.ElementTree as XML
import jenkins_jobs.modules.base
from jenkins_jobs.modules import hudson_model
from jenkins_jobs.modules.helpers import config_file_provider_settings
from jenkins_jobs.errors import InvalidAttributeError
class Maven(jenkins_jobs.modules.base.Base):
@ -150,8 +155,14 @@ class Maven(jenkins_jobs.modules.base.Base):
config_file_provider_settings(xml_parent, data['maven'])
run_post_steps = XML.SubElement(xml_parent, 'runPostStepsIfResult')
XML.SubElement(run_post_steps, 'name').text = 'FAILURE'
XML.SubElement(run_post_steps, 'ordinal').text = '2'
XML.SubElement(run_post_steps, 'color').text = 'red'
run_conditions = ['SUCCESS', 'UNSTABLE', 'FAILURE']
run_condition = data['maven'].get('post-step-run-condition', 'FAILURE')
if run_condition not in run_conditions:
raise InvalidAttributeError('post-step-run-condition',
run_condition, run_conditions)
cond_dict = hudson_model.THRESHOLDS[run_condition]
XML.SubElement(run_post_steps, 'name').text = cond_dict['name']
XML.SubElement(run_post_steps, 'ordinal').text = cond_dict['ordinal']
XML.SubElement(run_post_steps, 'color').text = cond_dict['color']
return xml_parent

2
tests/general/fixtures/project-maven001.xml
View File

@ -27,7 +27,7 @@
<runPostStepsIfResult>
<name>FAILURE</name>
<ordinal>2</ordinal>
<color>red</color>
<color>RED</color>
</runPostStepsIfResult>
<actions/>
<keepDependencies>false</keepDependencies>

2
tests/general/fixtures/project-maven002.xml
View File

@ -19,7 +19,7 @@
<runPostStepsIfResult>
<name>FAILURE</name>
<ordinal>2</ordinal>
<color>red</color>
<color>RED</color>
</runPostStepsIfResult>
<actions/>
<keepDependencies>false</keepDependencies>

6
tests/general/fixtures/project-maven003.xml
View File

@ -20,9 +20,9 @@
<settingsConfigId>org.jenkinsci.plugins.configfiles.maven.GlobalMavenSettingsConfig0123456789012</settingsConfigId>
</globalSettings>
<runPostStepsIfResult>
<name>FAILURE</name>
<ordinal>2</ordinal>
<color>red</color>
<name>SUCCESS</name>
<ordinal>0</ordinal>
<color>BLUE</color>
</runPostStepsIfResult>
<actions/>
<keepDependencies>false</keepDependencies>

1
tests/general/fixtures/project-maven003.yaml
View File

@ -4,3 +4,4 @@ maven:
goals: deploy
settings: org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig0123456789012
global-settings: org.jenkinsci.plugins.configfiles.maven.GlobalMavenSettingsConfig0123456789012
post-step-run-condition: SUCCESS