Merge "Refactor Gerrit plugin build jobs"

jenkins/jobs/gerrit-plugin-jobs.yaml

@@ -1,6 +1,5 @@
-
 - job-template:
-    name: 'periodic-gerrit-plugin-{name}-{plugin-branch}'
+    name: '{plugin-name}-gerrit-plugin-{plugin-branch}'
     node: '{node}'
 
     wrappers:
@@ -31,8 +30,3 @@
           warfile: 'gerrit/buck-out/gen/plugins/{plugin-name}/{plugin-name}-*.jar'
           target: 'tarballs/ci/gerrit/plugins/{plugin-name}'
       - console-log
-
-- job-group:
-    name: gerrit-plugin-jobs-{plugin-branch}
-    jobs:
-      - 'periodic-gerrit-plugin-{name}-{plugin-branch}'

jenkins/jobs/projects.yaml

@@ -1961,6 +1961,24 @@
     jobs:
       - jenkins-plugin-jobs
 
+- project:
+    name: gerrit
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+    gerrit-project: 'https://git.openstack.org/openstack-infra/gerrit'
+
+    jobs:
+      - '{plugin-name}-gerrit-plugin-{plugin-branch}':
+          gerrit-branch: 'openstack/2.8.4'
+          plugin-name: 'javamelody'
+          plugin-project: 'https://gerrit.googlesource.com/plugins/{plugin-name}'
+          plugin-branch: 'stable-2.8'
+      - '{plugin-name}-gerrit-plugin-{plugin-branch}':
+          gerrit-branch: 'openstack/2.9.4'
+          plugin-name: 'javamelody'
+          plugin-project: 'https://gerrit.googlesource.com/plugins/{plugin-name}'
+          plugin-branch: 'stable-2.9'
+
 - project:
     name: gerritbot
     node: 'bare-precise || bare-trusty'
@@ -2049,25 +2067,6 @@
       - gate-{name}-tox-{envlist}:
           envlist: ical
 
-- project:
-    name: javamelody-gerrit-plugin
-    node: 'bare-precise || bare-trusty'
-    tarball-site: tarballs.openstack.org
-
-    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
     node: 'bare-precise || bare-trusty'

zuul/layout.yaml

@@ -3305,8 +3305,8 @@ projects:
       - gerrit-package
       - gerrit-package-buck
     periodic:
-      - periodic-gerrit-plugin-javamelody-gerrit-plugin-stable-2.8
-      - periodic-gerrit-plugin-javamelody-gerrit-plugin-stable-2.9
+      - javamelody-gerrit-plugin-stable-2.8
+      - javamelody-gerrit-plugin-stable-2.9
 
   - name: openstack-infra/gerritbot
     template: