jjb/jenkins-job-builder
Code Issues Proposed changes

wrappers: fix XML node name for scrip-env's only-run-on-parent

Browse Source 
Jenkins configuration wants it as runOnlyOnParent (vs onlyRunOnParent).

https://storyboard.openstack.org/#!/story/2001547

Change-Id: Icbf9b44cabe6f111941659ec5b084d44c0fc8a59
This commit is contained in:
Inaky Perez-Gonzalez 2018-02-15 13:28:38 -08:00 committed by Thanh Ha
parent e55b3d408c
commit d66cd3e6da
No known key found for this signature in database
GPG Key ID: B0CB27E00DA095AA
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jenkins_jobs/modules/wrappers.py
View File

@ -1054,7 +1054,7 @@ def env_script(registry, xml_parent, data):
mapping = [ mapping = [
('script-content', 'script', ''), ('script-content', 'script', ''),
('script-type', 'scriptType', 'unix-script', valid_script_types), ('script-type', 'scriptType', 'unix-script', valid_script_types),
('only-run-on-parent', 'onlyRunOnParent', False)] ('only-run-on-parent', 'runOnlyOnParent', False)]
convert_mapping_to_xml(el, data, mapping, fail_required=True) convert_mapping_to_xml(el, data, mapping, fail_required=True)

2
tests/wrappers/fixtures/env-script001.xml
View File

@ -4,7 +4,7 @@
<com.lookout.jenkins.EnvironmentScript> <com.lookout.jenkins.EnvironmentScript>
<script>echo foo=bar</script> <script>echo foo=bar</script>
<scriptType>unixScript</scriptType> <scriptType>unixScript</scriptType>
<onlyRunOnParent>true</onlyRunOnParent> <runOnlyOnParent>true</runOnlyOnParent>
</com.lookout.jenkins.EnvironmentScript> </com.lookout.jenkins.EnvironmentScript>
</buildWrappers> </buildWrappers>
</project> </project>

2
tests/wrappers/fixtures/env-script002.xml
View File

@ -4,7 +4,7 @@
<com.lookout.jenkins.EnvironmentScript> <com.lookout.jenkins.EnvironmentScript>
<script>echo foo=bar</script> <script>echo foo=bar</script>
<scriptType>batchScript</scriptType> <scriptType>batchScript</scriptType>
<onlyRunOnParent>true</onlyRunOnParent> <runOnlyOnParent>true</runOnlyOnParent>
</com.lookout.jenkins.EnvironmentScript> </com.lookout.jenkins.EnvironmentScript>
</buildWrappers> </buildWrappers>
</project> </project>