diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-07 18:28:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-07 18:28:33 +0000 |
| commit | 99e9b234bc39f099000e4c819c560567176dc492 (patch) | |
| tree | 328ff1d08a76ac2d8f95b40aceef3dbe6c75ebe4 | |
| parent | 7b00932d2c4ccd25a269ca6238f90427f3c6ad37 (diff) | |
| parent | 8a27ad1ed16ec432265aeedf001e7fdc9fa920a7 (diff) | |
| download | python-jenkins-job-builder-99e9b234bc39f099000e4c819c560567176dc492.tar.gz python-jenkins-job-builder-99e9b234bc39f099000e4c819c560567176dc492.tar.xz python-jenkins-job-builder-99e9b234bc39f099000e4c819c560567176dc492.zip | |
Merge "Fix gerrit-code-review plugin name"
| -rw-r--r-- | jenkins_jobs/modules/project_multibranch.py | 5 | ||||
| -rw-r--r-- | tests/multibranch/fixtures/scm_gerrit_full.xml | 2 | ||||
| -rw-r--r-- | tests/multibranch/fixtures/scm_gerrit_minimal.xml | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/jenkins_jobs/modules/project_multibranch.py b/jenkins_jobs/modules/project_multibranch.py index 3761ddc1..2a7a3870 100644 --- a/jenkins_jobs/modules/project_multibranch.py +++ b/jenkins_jobs/modules/project_multibranch.py @@ -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", "")])), diff --git a/tests/multibranch/fixtures/scm_gerrit_full.xml b/tests/multibranch/fixtures/scm_gerrit_full.xml index 04c59aec..55cc9c88 100644 --- a/tests/multibranch/fixtures/scm_gerrit_full.xml +++ b/tests/multibranch/fixtures/scm_gerrit_full.xml @@ -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> diff --git a/tests/multibranch/fixtures/scm_gerrit_minimal.xml b/tests/multibranch/fixtures/scm_gerrit_minimal.xml index 60959552..b29acd09 100644 --- a/tests/multibranch/fixtures/scm_gerrit_minimal.xml +++ b/tests/multibranch/fixtures/scm_gerrit_minimal.xml @@ -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/> |