From 14e93d0b956864af13f95a8497717e1436595d6b Mon Sep 17 00:00:00 2001
From: Khai Do <zaro0508@gmail.com>
Date: Wed, 11 Feb 2015 23:12:53 -0800
Subject: [PATCH] Add a job for Gerrit javamelody plugin ver 2.9

Refactor the job to build both version 2.8 and 2.9 of the Gerrit javamelody
plugin.

Depends-on: I0b4a4482f6e558ad8f0a05c4debc8c6aeffbd61c
Change-Id: Ia931d053cbf9dbe53c9153f9268c440e2f940544
---
 jenkins/jobs/gerrit-plugin-jobs.yaml |  6 +++---
 jenkins/jobs/projects.yaml           | 18 ++++++++++++------
 zuul/layout.yaml                     |  3 ++-
 3 files changed, 17 insertions(+), 10 deletions(-)

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: