jjb/jenkins-job-builder
Code Issues Proposed changes

Merge "Wrapper pre-scm-buildstep: added support for failOnError parameter"

Browse Source
This commit is contained in:
Jenkins 2017-03-29 09:55:34 +00:00 committed by Gerrit Code Review
commit 4f77324fea
14 changed files with 163 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
jenkins_jobs/modules/wrappers.py
View File

@ -1402,33 +1402,34 @@ def pre_scm_buildstep(registry, xml_parent, data):
Execute a Build Step before running the SCM
Requires the Jenkins :jenkins-wiki:`pre-scm-buildstep <pre-scm-buildstep>`.
:arg string failOnError: Specifies if the job should fail on error
(plugin >= 0.3) (default false).
:arg list buildsteps: List of build steps to execute
:Buildstep: Any acceptable builder, as seen in the example
Example::
Example:
wrappers:
- pre-scm-buildstep:
- shell: |
#!/bin/bash
echo "Doing somethiung cool"
- shell: |
#!/bin/zsh
echo "Doing somethin cool with zsh"
- ant: "target1 target2"
ant-name: "Standard Ant"
- inject:
properties-file: example.prop
properties-content: EXAMPLE=foo-bar
.. literalinclude::
/../../tests/wrappers/fixtures/pre-scm-buildstep001.yaml
:language: yaml
"""
# Get plugin information to maintain backwards compatibility
info = registry.get_plugin_info('preSCMbuildstep')
version = pkg_resources.parse_version(info.get('version', "0"))
bsp = XML.SubElement(xml_parent,
'org.jenkinsci.plugins.preSCMbuildstep.'
'PreSCMBuildStepsWrapper')
bs = XML.SubElement(bsp, 'buildSteps')
for step in data:
stepList = data if type(data) is list else data.get('buildsteps')
for step in stepList:
for edited_node in create_builders(registry, step):
bs.append(edited_node)
if version >= pkg_resources.parse_version("0.3"):
XML.SubElement(bsp, 'failOnError').text = str(data.get(
'failOnError', False)).lower()
def logstash(registry, xml_parent, data):

7
tests/cmd/fixtures/unicode001.yaml
View File

@ -2,9 +2,10 @@
name: unicode-wrapper
wrappers:
- pre-scm-buildstep:
- shell: |
#!/bin/bash
echo "Unicode! ☃"
buildsteps:
- shell: |
#!/bin/bash
echo "Unicode! ☃"
- job:
name: test-unicode-wrapper

42
tests/jsonparser/fixtures/complete001.json
View File

@ -19,26 +19,28 @@
"name": "pre-scm-shell-ant",
"wrappers": [
{
"pre-scm-buildstep": [
{
"shell": "#!/bin/bash\necho \"Doing somethiung cool\"\n"
},
{
"shell": "#!/bin/zsh\necho \"Doing somethin cool with zsh\"\n"
},
{
"ant": {
"targets": "target1 target2",
"ant-name": "Standard Ant"
"pre-scm-buildstep": {
"buildsteps": [
{
"shell": "#!/bin/bash\necho \"Doing somethiung cool\"\n"
},
{
"shell": "#!/bin/zsh\necho \"Doing somethin cool with zsh\"\n"
},
{
"ant": {
"targets": "target1 target2",
"ant-name": "Standard Ant"
}
},
{
"inject": {
"properties-file": "example.prop",
"properties-content": "EXAMPLE=foo-bar"
}
}
},
{
"inject": {
"properties-file": "example.prop",
"properties-content": "EXAMPLE=foo-bar"
}
}
]
]
}
}
]
}
@ -165,4 +167,4 @@
]
}
}
]
]

3
tests/wrappers/fixtures/pre-scm-buildstep001.plugins_info.yaml Normal file
View File

@ -0,0 +1,3 @@
- longName: 'Pre SCM BuildStep Plugin'
shortName: 'preSCMbuildstep'
version: "0.3"

30
tests/wrappers/fixtures/pre-scm-buildstep001.xml Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<project>
<buildWrappers>
<org.jenkinsci.plugins.preSCMbuildstep.PreSCMBuildStepsWrapper>
<buildSteps>
<hudson.tasks.Shell>
<command>#!/bin/bash
echo &quot;Doing something cool&quot;
</command>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
<command>#!/bin/zsh
echo &quot;Doing something cool with zsh&quot;
</command>
</hudson.tasks.Shell>
<hudson.tasks.Ant>
<targets>target1 target2</targets>
<antName>default</antName>
</hudson.tasks.Ant>
<EnvInjectBuilder>
<info>
<propertiesFilePath>example.prop</propertiesFilePath>
<propertiesContent>EXAMPLE=foo-bar</propertiesContent>
</info>
</EnvInjectBuilder>
</buildSteps>
<failOnError>true</failOnError>
</org.jenkinsci.plugins.preSCMbuildstep.PreSCMBuildStepsWrapper>
</buildWrappers>
</project>

15
tests/wrappers/fixtures/pre-scm-buildstep001.yaml Normal file
View File

@ -0,0 +1,15 @@
wrappers:
- pre-scm-buildstep:
failOnError: true
buildsteps:
- shell: |
#!/bin/bash
echo "Doing something cool"
- shell: |
#!/bin/zsh
echo "Doing something cool with zsh"
- ant: "target1 target2"
ant-name: "Standard Ant"
- inject:
properties-file: example.prop
properties-content: EXAMPLE=foo-bar

3
tests/wrappers/fixtures/pre-scm-buildstep002.plugins_info.yaml Normal file
View File

@ -0,0 +1,3 @@
- longName: 'Pre SCM BuildStep Plugin'
shortName: 'preSCMbuildstep'
version: "0.2"

19
tests/wrappers/fixtures/pre-scm-buildstep002.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<project>
<buildWrappers>
<org.jenkinsci.plugins.preSCMbuildstep.PreSCMBuildStepsWrapper>
<buildSteps>
<hudson.tasks.Shell>
<command>#!/bin/bash
echo &quot;Doing something cool&quot;
</command>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
<command>#!/bin/zsh
echo &quot;Doing something cool with zsh&quot;
</command>
</hudson.tasks.Shell>
</buildSteps>
</org.jenkinsci.plugins.preSCMbuildstep.PreSCMBuildStepsWrapper>
</buildWrappers>
</project>

8
tests/wrappers/fixtures/pre-scm-buildstep002.yaml Normal file
View File

@ -0,0 +1,8 @@
wrappers:
- pre-scm-buildstep:
- shell: |
#!/bin/bash
echo "Doing something cool"
- shell: |
#!/bin/zsh
echo "Doing something cool with zsh"

26
tests/yamlparser/fixtures/complete001.yaml
View File

@ -11,18 +11,19 @@
name: pre-scm-shell-ant
wrappers:
- pre-scm-buildstep:
- shell: |
#!/bin/bash
echo "Doing somethiung cool"
- shell: |
#!/bin/zsh
echo "Doing somethin cool with zsh"
- ant:
targets: "target1 target2"
ant-name: "Standard Ant"
- inject:
properties-file: example.prop
properties-content: EXAMPLE=foo-bar
buildsteps:
- shell: |
#!/bin/bash
echo "Doing somethiung cool"
- shell: |
#!/bin/zsh
echo "Doing somethin cool with zsh"
- ant:
targets: "target1 target2"
ant-name: "Standard Ant"
- inject:
properties-file: example.prop
properties-content: EXAMPLE=foo-bar
- wrapper:
name: copy-files
@ -104,4 +105,3 @@
#!/usr/bin/env python
#
print("Doing something cool with python")

22
tests/yamlparser/fixtures/include-raw001.yaml
View File

@ -12,16 +12,17 @@
name: pre-scm-shell-ant
wrappers:
- pre-scm-buildstep:
- shell:
!include-raw: include-raw002-cool.sh
- shell:
!include-raw: include-raw002-cool.zsh
- ant:
targets: "target1 target2"
ant-name: "Standard Ant"
- inject:
properties-file: example.prop
properties-content: EXAMPLE=foo-bar
buildsteps:
- shell:
!include-raw: include-raw002-cool.sh
- shell:
!include-raw: include-raw002-cool.zsh
- ant:
targets: "target1 target2"
ant-name: "Standard Ant"
- inject:
properties-file: example.prop
properties-content: EXAMPLE=foo-bar
- wrapper:
name: copy-files
@ -42,4 +43,3 @@
- inject:
keep-build-variables: true
keep-system-variables: true

5
tests/yamlparser/fixtures/include-rawunicode001.yaml
View File

@ -2,8 +2,9 @@
name: unicode-raw-include-wrapper
wrappers:
- pre-scm-buildstep:
- shell:
!include-raw: include-rawunicode001-cool.sh
buildsteps:
- shell:
!include-raw: include-rawunicode001-cool.sh
- job:
name: test-unicode-raw-include-wrapper

24
tests/yamlparser/fixtures/include001.yaml
View File

@ -12,17 +12,18 @@
name: pre-scm-shell-ant
wrappers:
- pre-scm-buildstep:
- shell: |
#!/bin/bash
echo "Doing somethiung cool"
- shell: |
#!/bin/zsh
echo "Doing somethin cool with zsh"
- ant: "target1 target2"
ant-name: "Standard Ant"
- inject:
properties-file: example.prop
properties-content: EXAMPLE=foo-bar
buildsteps:
- shell: |
#!/bin/bash
echo "Doing somethiung cool"
- shell: |
#!/bin/zsh
echo "Doing somethin cool with zsh"
- ant: "target1 target2"
ant-name: "Standard Ant"
- inject:
properties-file: example.prop
properties-content: EXAMPLE=foo-bar
- wrapper:
name: copy-files
@ -43,4 +44,3 @@
- inject:
keep-build-variables: true
keep-system-variables: true

7
tests/yamlparser/fixtures/unicode001.yaml
View File

@ -2,9 +2,10 @@
name: unicode-wrapper
wrappers:
- pre-scm-buildstep:
- shell: |
#!/bin/bash
echo "Unicode! ☃"
buildsteps:
- shell: |
#!/bin/bash
echo "Unicode! ☃"
- job:
name: test-unicode-wrapper