jjb/jenkins-job-builder
Code Issues Proposed changes

Fix gerrit-code-review plugin name

Browse Source 
The GerritSCMSource type for the multibranch pipeline does not
belong to the 'gerrit' plugin but rather to the 'gerrit-code-review'
plugin.

Change-Id: I5edd81a3506847c3e5910ad66d4498a2b8c899e9
This commit is contained in:
Luca Milanesio 2020-01-03 10:21:17 +00:00
parent 497198a252
commit 8a27ad1ed1
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jenkins_jobs/modules/project_multibranch.py
View File

@ -583,7 +583,10 @@ def gerrit_scm(xml_parent, data):
source = XML.SubElement(
xml_parent,
"source",
{"class": "jenkins.plugins.gerrit.GerritSCMSource", "plugin": "gerrit"},
{
"class": "jenkins.plugins.gerrit.GerritSCMSource",
"plugin": "gerrit-code-review",
},
)
source_mapping = [
("", "id", "-".join(["gr", data.get("url", "")])),

2
tests/multibranch/fixtures/scm_gerrit_full.xml
View File

@ -31,7 +31,7 @@
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">
<data>
<jenkins.branch.BranchSource>
<source class="jenkins.plugins.gerrit.GerritSCMSource" plugin="gerrit">
<source class="jenkins.plugins.gerrit.GerritSCMSource" plugin="gerrit-code-review">
<id>gr-https://review.gerrithub.io/johndoe/foo</id>
<remote>https://review.gerrithub.io/johndoe/foo</remote>
<credentialsId>secret</credentialsId>

2
tests/multibranch/fixtures/scm_gerrit_minimal.xml
View File

@ -31,7 +31,7 @@
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">
<data>
<jenkins.branch.BranchSource>
<source class="jenkins.plugins.gerrit.GerritSCMSource" plugin="gerrit">
<source class="jenkins.plugins.gerrit.GerritSCMSource" plugin="gerrit-code-review">
<id>gr-https://review.gerrithub.io/johndoe/foo</id>
<remote>https://review.gerrithub.io/johndoe/foo</remote>
<credentialsId/>