diff --git a/jenkins/jobs/gerrit-plugin-jobs.yaml b/jenkins/jobs/gerrit-plugin-jobs.yaml index da67c2380d..d07bc9e753 100644 --- a/jenkins/jobs/gerrit-plugin-jobs.yaml +++ b/jenkins/jobs/gerrit-plugin-jobs.yaml @@ -1,6 +1,6 @@ - job-template: - name: 'periodic-gerrit-plugin-{name}' + name: 'periodic-gerrit-plugin-{name}-{plugin-branch}' node: '{node}' wrappers: @@ -33,6 +33,6 @@ - console-log - job-group: - name: gerrit-plugin-jobs + name: gerrit-plugin-jobs-{plugin-branch} jobs: - - 'periodic-gerrit-plugin-{name}' + - 'periodic-gerrit-plugin-{name}-{plugin-branch}' \ No newline at end of file diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 7feac8cf3c..67c0a8591d 100755 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -2047,14 +2047,20 @@ name: javamelody-gerrit-plugin node: 'bare-precise || bare-trusty' tarball-site: tarballs.openstack.org - gerrit-project: https://git.openstack.org/openstack-infra/gerrit - gerrit-branch: openstack/2.8.4 - plugin-project: https://gerrit.googlesource.com/plugins/javamelody - plugin-name: javamelody - plugin-branch: stable-2.8 jobs: - - gerrit-plugin-jobs + - 'gerrit-plugin-jobs-{plugin-branch}': + gerrit-project: 'https://git.openstack.org/openstack-infra/gerrit' + gerrit-branch: 'openstack/2.8.4' + plugin-project: 'https://gerrit.googlesource.com/plugins/javamelody' + plugin-name: 'javamelody' + plugin-branch: 'stable-2.8' + - 'gerrit-plugin-jobs-{plugin-branch}': + gerrit-project: 'https://git.openstack.org/openstack-infra/gerrit' + gerrit-branch: 'openstack/2.9.4' + plugin-project: 'https://gerrit.googlesource.com/plugins/javamelody' + plugin-name: 'javamelody' + plugin-branch: 'stable-2.9' - project: name: jeepyb diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 236400910b..2b91036ef1 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3273,7 +3273,8 @@ projects: - gerrit-package - gerrit-package-buck periodic: - - periodic-gerrit-plugin-javamelody-gerrit-plugin + - periodic-gerrit-plugin-javamelody-gerrit-plugin-stable-2.8 + - periodic-gerrit-plugin-javamelody-gerrit-plugin-stable-2.9 - name: openstack-infra/gerritbot template: