jjb
/
jenkins-job-builder
Code Issues Proposed changes

Merge "Fix Multiple SCMs Plugin child XML format"

This commit is contained in:
Jenkins 2016-06-14 16:51:52 +00:00 committed by Gerrit Code Review
parent df1ab0f01a c28ac736be
commit c81f71a2c4
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jenkins_jobs/modules/scm.py
View File

@ -1240,4 +1240,12 @@ class SCM(jenkins_jobs.modules.base.Base):
class_name = 'org.jenkinsci.plugins.multiplescms.MultiSCM'
xml_attribs = {'class': class_name}
xml_parent = XML.SubElement(xml_parent, 'scm', xml_attribs)
for scms_child in scms_parent:
try:
scms_child.tag = scms_child.attrib['class']
del(scms_child.attrib['class'])
except KeyError:
pass
xml_parent.append(scms_parent)

8
tests/macros/fixtures/scm/multi-scms001.xml
View File

@ -10,7 +10,7 @@
<properties/>
<scm class="org.jenkinsci.plugins.multiplescms.MultiSCM">
<scms>
<scm class="hudson.plugins.git.GitSCM">
<hudson.plugins.git.GitSCM>
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@ -46,8 +46,8 @@
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
<scm class="hudson.plugins.git.GitSCM">
</hudson.plugins.git.GitSCM>
<hudson.plugins.git.GitSCM>
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@ -83,7 +83,7 @@
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
</hudson.plugins.git.GitSCM>
</scms>
</scm>
<builders/>

8
tests/macros/fixtures/scm/multi-scms002.xml
View File

@ -10,7 +10,7 @@
<properties/>
<scm class="org.jenkinsci.plugins.multiplescms.MultiSCM">
<scms>
<scm class="hudson.plugins.repo.RepoScm">
<hudson.plugins.repo.RepoScm>
<manifestRepositoryUrl>https://example.com/project/</manifestRepositoryUrl>
<manifestBranch>stable</manifestBranch>
<manifestFile>repo.xml</manifestFile>
@ -27,8 +27,8 @@
<noTags>false</noTags>
<trace>false</trace>
<showAllChanges>false</showAllChanges>
</scm>
<scm class="hudson.plugins.git.GitSCM">
</hudson.plugins.repo.RepoScm>
<hudson.plugins.git.GitSCM>
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@ -64,7 +64,7 @@
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
</hudson.plugins.git.GitSCM>
</scms>
</scm>
<builders/>

4
tests/scm/fixtures/raw001.xml
View File

@ -2,7 +2,7 @@
<project>
<scm class="org.jenkinsci.plugins.multiplescms.MultiSCM">
<scms>
<scm class="hudson.plugins.git.GitSCM">
<hudson.plugins.git.GitSCM>
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@ -38,7 +38,7 @@
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
</hudson.plugins.git.GitSCM>
<scm>
<scmraw/>
</scm>