Remove gerrit-buck-bazel-plugin-template.yaml

We no longer support buck, so the buck/bazel template is redundant.

Remove it and rename all the job definitions to use the bazel one.

Also rename all other templates to remove 'buck'.

Change-Id: Ifc0eded0221fc743477af4eaf273b25261e48c8c
diff --git a/jenkins/gerrit-bazel-plugin-account.yaml b/jenkins/gerrit-bazel-plugin-account.yaml
index 3c01ede..70685c3 100644
--- a/jenkins/gerrit-bazel-plugin-account.yaml
+++ b/jenkins/gerrit-bazel-plugin-account.yaml
@@ -1,10 +1,22 @@
 - job-template:
     name: 'plugin-account-bazel-{branch}'
     description: "Plugin account {branch} branch build with Bazel\n"
-    defaults: plugin-template
+    defaults: plugin-template-bazel
     node: bazel-debian
     class: plugins
     project-name: plugins%2Faccount
+    scm:
+      - git:
+         remotes:
+           - origin:
+               url: https://gerrit.googlesource.com/plugins/{name}
+           - gerrit:
+               url: https://gerrit.googlesource.com/gerrit
+         branches:
+           - origin/{branch}
+         submodule:
+           recursive: true
+         skip-tag: true
     builders:
       - shell:
          !include-raw: gerrit-bazel-build-account-plugin.sh
diff --git a/jenkins/gerrit-buck-bazel-plugin-admin-console.yaml b/jenkins/gerrit-bazel-plugin-admin-console.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-admin-console.yaml
rename to jenkins/gerrit-bazel-plugin-admin-console.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-automerger.yaml b/jenkins/gerrit-bazel-plugin-automerger.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-automerger.yaml
rename to jenkins/gerrit-bazel-plugin-automerger.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-avatars-external.yaml b/jenkins/gerrit-bazel-plugin-avatars-external.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-avatars-external.yaml
rename to jenkins/gerrit-bazel-plugin-avatars-external.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-avatars-gravatar.yaml b/jenkins/gerrit-bazel-plugin-avatars-gravatar.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-avatars-gravatar.yaml
rename to jenkins/gerrit-bazel-plugin-avatars-gravatar.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-branch-network.yaml b/jenkins/gerrit-bazel-plugin-branch-network.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-branch-network.yaml
rename to jenkins/gerrit-bazel-plugin-branch-network.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-cfoauth.yaml b/jenkins/gerrit-bazel-plugin-cfoauth.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-cfoauth.yaml
rename to jenkins/gerrit-bazel-plugin-cfoauth.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-checks.yaml b/jenkins/gerrit-bazel-plugin-checks.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-checks.yaml
rename to jenkins/gerrit-bazel-plugin-checks.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-cloud-notifications.yaml b/jenkins/gerrit-bazel-plugin-cloud-notifications.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-cloud-notifications.yaml
rename to jenkins/gerrit-bazel-plugin-cloud-notifications.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-delete-project.yaml b/jenkins/gerrit-bazel-plugin-delete-project.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-delete-project.yaml
rename to jenkins/gerrit-bazel-plugin-delete-project.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-egit.yaml b/jenkins/gerrit-bazel-plugin-egit.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-egit.yaml
rename to jenkins/gerrit-bazel-plugin-egit.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-emoticons.yaml b/jenkins/gerrit-bazel-plugin-emoticons.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-emoticons.yaml
rename to jenkins/gerrit-bazel-plugin-emoticons.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-events-log.yaml b/jenkins/gerrit-bazel-plugin-events-log.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-events-log.yaml
rename to jenkins/gerrit-bazel-plugin-events-log.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-force-draft.yaml b/jenkins/gerrit-bazel-plugin-force-draft.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-force-draft.yaml
rename to jenkins/gerrit-bazel-plugin-force-draft.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-gh-template.yaml b/jenkins/gerrit-bazel-plugin-gh-template.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-gh-template.yaml
rename to jenkins/gerrit-bazel-plugin-gh-template.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-gitblit.yaml b/jenkins/gerrit-bazel-plugin-gitblit.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-gitblit.yaml
rename to jenkins/gerrit-bazel-plugin-gitblit.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-gitiles.yaml b/jenkins/gerrit-bazel-plugin-gitiles.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-gitiles.yaml
rename to jenkins/gerrit-bazel-plugin-gitiles.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-go-import.yaml b/jenkins/gerrit-bazel-plugin-go-import.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-go-import.yaml
rename to jenkins/gerrit-bazel-plugin-go-import.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-groovy-provider.yaml b/jenkins/gerrit-bazel-plugin-groovy-provider.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-groovy-provider.yaml
rename to jenkins/gerrit-bazel-plugin-groovy-provider.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-high-availability.yaml b/jenkins/gerrit-bazel-plugin-high-availability.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-high-availability.yaml
rename to jenkins/gerrit-bazel-plugin-high-availability.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-imagare.yaml b/jenkins/gerrit-bazel-plugin-imagare.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-imagare.yaml
rename to jenkins/gerrit-bazel-plugin-imagare.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-importer.yaml b/jenkins/gerrit-bazel-plugin-importer.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-importer.yaml
rename to jenkins/gerrit-bazel-plugin-importer.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-its-base.yaml b/jenkins/gerrit-bazel-plugin-its-base.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-its-base.yaml
rename to jenkins/gerrit-bazel-plugin-its-base.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-its-bugzilla.yaml b/jenkins/gerrit-bazel-plugin-its-bugzilla.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-its-bugzilla.yaml
rename to jenkins/gerrit-bazel-plugin-its-bugzilla.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-its-jira.yaml b/jenkins/gerrit-bazel-plugin-its-jira.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-its-jira.yaml
rename to jenkins/gerrit-bazel-plugin-its-jira.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-its-phabricator.yaml b/jenkins/gerrit-bazel-plugin-its-phabricator.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-its-phabricator.yaml
rename to jenkins/gerrit-bazel-plugin-its-phabricator.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-its-rtc.yaml b/jenkins/gerrit-bazel-plugin-its-rtc.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-its-rtc.yaml
rename to jenkins/gerrit-bazel-plugin-its-rtc.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-its-storyboard.yaml b/jenkins/gerrit-bazel-plugin-its-storyboard.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-its-storyboard.yaml
rename to jenkins/gerrit-bazel-plugin-its-storyboard.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-its-template.yaml b/jenkins/gerrit-bazel-plugin-its-template.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-its-template.yaml
rename to jenkins/gerrit-bazel-plugin-its-template.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-javamelody.yaml b/jenkins/gerrit-bazel-plugin-javamelody.yaml
similarity index 70%
rename from jenkins/gerrit-buck-bazel-plugin-javamelody.yaml
rename to jenkins/gerrit-bazel-plugin-javamelody.yaml
index cb8dea8..d79926a 100644
--- a/jenkins/gerrit-buck-bazel-plugin-javamelody.yaml
+++ b/jenkins/gerrit-bazel-plugin-javamelody.yaml
@@ -1,7 +1,19 @@
 - job-template:
     name: 'plugin-javamelody-bazel-{branch}'
     description: "JavaMelody plugin {branch} branch build with Bazel\n"
-    defaults: plugin-template
+    defaults: plugin-template-bazel
+    scm:
+      - git:
+         remotes:
+           - origin:
+               url: https://gerrit.googlesource.com/plugins/{name}
+           - gerrit:
+               url: https://gerrit.googlesource.com/gerrit
+         branches:
+           - origin/{branch}
+         submodule:
+           recursive: true
+         skip-tag: true
     builders:
       - shell:
          !include-raw: gerrit-bazel-build-plugin.sh
diff --git a/jenkins/gerrit-buck-bazel-plugin-kafka-events.yaml b/jenkins/gerrit-bazel-plugin-kafka-events.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-kafka-events.yaml
rename to jenkins/gerrit-bazel-plugin-kafka-events.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-labelui.yaml b/jenkins/gerrit-bazel-plugin-labelui.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-labelui.yaml
rename to jenkins/gerrit-bazel-plugin-labelui.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-lfs.yaml b/jenkins/gerrit-bazel-plugin-lfs.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-lfs.yaml
rename to jenkins/gerrit-bazel-plugin-lfs.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-manual-template.yaml b/jenkins/gerrit-bazel-plugin-manual-template.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-manual-template.yaml
rename to jenkins/gerrit-bazel-plugin-manual-template.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-menuextender.yaml b/jenkins/gerrit-bazel-plugin-menuextender.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-menuextender.yaml
rename to jenkins/gerrit-bazel-plugin-menuextender.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-metrics-reporter-graphite.yaml b/jenkins/gerrit-bazel-plugin-metrics-reporter-graphite.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-metrics-reporter-graphite.yaml
rename to jenkins/gerrit-bazel-plugin-metrics-reporter-graphite.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-metrics-reporter-jmx.yaml b/jenkins/gerrit-bazel-plugin-metrics-reporter-jmx.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-metrics-reporter-jmx.yaml
rename to jenkins/gerrit-bazel-plugin-metrics-reporter-jmx.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-motd.yaml b/jenkins/gerrit-bazel-plugin-motd.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-motd.yaml
rename to jenkins/gerrit-bazel-plugin-motd.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-oauth.yaml b/jenkins/gerrit-bazel-plugin-oauth.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-oauth.yaml
rename to jenkins/gerrit-bazel-plugin-oauth.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-owners.yaml b/jenkins/gerrit-bazel-plugin-owners.yaml
similarity index 62%
rename from jenkins/gerrit-buck-bazel-plugin-owners.yaml
rename to jenkins/gerrit-bazel-plugin-owners.yaml
index 61e7cf3..0c33472 100644
--- a/jenkins/gerrit-buck-bazel-plugin-owners.yaml
+++ b/jenkins/gerrit-bazel-plugin-owners.yaml
@@ -1,7 +1,19 @@
 - job-template:
     name: 'plugin-owners-bazel-{branch}'
     description: "Plugin owners {branch} branch build with Bazel\n"
-    defaults: plugin-template
+    defaults: plugin-template-bazel
+    scm:
+      - git:
+         remotes:
+           - origin:
+               url: https://gerrit.googlesource.com/plugins/{name}
+           - gerrit:
+               url: https://gerrit.googlesource.com/gerrit
+         branches:
+           - origin/{branch}
+         submodule:
+           recursive: true
+         skip-tag: true
     builders:
       - shell:
          !include-raw: gerrit-bazel-build-owners-plugin.sh
@@ -14,7 +26,19 @@
     name: 'plugin-owners-bazel-{branch}-{gerrit-branch}'
     class: plugins
     description: "Plugin owners {branch} branch Bazel build for Gerrit {gerrit-branch}\n"
-    defaults: plugin-template
+    defaults: plugin-template-bazel
+    scm:
+      - git:
+         remotes:
+           - origin:
+               url: https://gerrit.googlesource.com/plugins/{name}
+           - gerrit:
+               url: https://gerrit.googlesource.com/gerrit
+         branches:
+           - origin/{branch}
+         submodule:
+           recursive: true
+         skip-tag: true
     project-name: plugins%2Fowners
     builders:
       - shell:
diff --git a/jenkins/gerrit-buck-bazel-plugin-plugin-manager.yaml b/jenkins/gerrit-bazel-plugin-plugin-manager.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-plugin-manager.yaml
rename to jenkins/gerrit-bazel-plugin-plugin-manager.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-project-download-commands.yaml b/jenkins/gerrit-bazel-plugin-project-download-commands.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-project-download-commands.yaml
rename to jenkins/gerrit-bazel-plugin-project-download-commands.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-project-group-structure.yaml b/jenkins/gerrit-bazel-plugin-project-group-structure.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-project-group-structure.yaml
rename to jenkins/gerrit-bazel-plugin-project-group-structure.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-quota.yaml b/jenkins/gerrit-bazel-plugin-quota.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-quota.yaml
rename to jenkins/gerrit-bazel-plugin-quota.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-rabbitmq.yaml b/jenkins/gerrit-bazel-plugin-rabbitmq.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-rabbitmq.yaml
rename to jenkins/gerrit-bazel-plugin-rabbitmq.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-readonly.yaml b/jenkins/gerrit-bazel-plugin-readonly.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-readonly.yaml
rename to jenkins/gerrit-bazel-plugin-readonly.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-ref-protection.yaml b/jenkins/gerrit-bazel-plugin-ref-protection.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-ref-protection.yaml
rename to jenkins/gerrit-bazel-plugin-ref-protection.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-reparent.yaml b/jenkins/gerrit-bazel-plugin-reparent.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-reparent.yaml
rename to jenkins/gerrit-bazel-plugin-reparent.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-replication.yaml b/jenkins/gerrit-bazel-plugin-replication.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-replication.yaml
rename to jenkins/gerrit-bazel-plugin-replication.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-review-strategy.yaml b/jenkins/gerrit-bazel-plugin-review-strategy.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-review-strategy.yaml
rename to jenkins/gerrit-bazel-plugin-review-strategy.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-reviewassistant.yaml b/jenkins/gerrit-bazel-plugin-reviewassistant.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-reviewassistant.yaml
rename to jenkins/gerrit-bazel-plugin-reviewassistant.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-reviewers-by-blame.yaml b/jenkins/gerrit-bazel-plugin-reviewers-by-blame.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-reviewers-by-blame.yaml
rename to jenkins/gerrit-bazel-plugin-reviewers-by-blame.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-reviewers.yaml b/jenkins/gerrit-bazel-plugin-reviewers.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-reviewers.yaml
rename to jenkins/gerrit-bazel-plugin-reviewers.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-scala-provider.yaml b/jenkins/gerrit-bazel-plugin-scala-provider.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-scala-provider.yaml
rename to jenkins/gerrit-bazel-plugin-scala-provider.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-scripting-template.yaml b/jenkins/gerrit-bazel-plugin-scripting-template.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-scripting-template.yaml
rename to jenkins/gerrit-bazel-plugin-scripting-template.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-secure-config.yaml b/jenkins/gerrit-bazel-plugin-secure-config.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-secure-config.yaml
rename to jenkins/gerrit-bazel-plugin-secure-config.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-server-config.yaml b/jenkins/gerrit-bazel-plugin-server-config.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-server-config.yaml
rename to jenkins/gerrit-bazel-plugin-server-config.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-serviceuser.yaml b/jenkins/gerrit-bazel-plugin-serviceuser.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-serviceuser.yaml
rename to jenkins/gerrit-bazel-plugin-serviceuser.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-supermanifest.yaml b/jenkins/gerrit-bazel-plugin-supermanifest.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-supermanifest.yaml
rename to jenkins/gerrit-bazel-plugin-supermanifest.yaml
diff --git a/jenkins/gerrit-bazel-plugin-template.yaml b/jenkins/gerrit-bazel-plugin-template.yaml
index 3094239..08e8631 100644
--- a/jenkins/gerrit-bazel-plugin-template.yaml
+++ b/jenkins/gerrit-bazel-plugin-template.yaml
@@ -22,6 +22,34 @@
       - pollscm:
           cron: 'H/50 * * * *'
 
+- job-template:
+    name: 'plugin-{name}-bazel-{branch}'
+    description: "Plugin {name} {branch} branch build with Bazel\n"
+    defaults: plugin-template-bazel
+    node: bazel-debian
+    class: plugins
+    project-name: plugins%2F{name}
+    scm:
+      - git:
+         remotes:
+           - origin:
+               url: https://gerrit.googlesource.com/plugins/{name}
+           - gerrit:
+               url: https://gerrit.googlesource.com/gerrit
+         branches:
+           - origin/{branch}
+         submodule:
+           recursive: true
+         skip-tag: true
+    builders:
+      - shell:
+         !include-raw: gerrit-bazel-build-plugin.sh
+      - shell:
+         !include-raw: gerrit-bazel-get-project-info.sh
+    publishers:
+      - archive:
+         artifacts: >
+           bazel-bin/plugins/{name}/{name}.jar, bazel-bin/plugins/{name}/{name}.jar-version, bazel-bin/plugins/{name}/{name}.json
 
 - job-template:
     name: 'plugin-{name}-bazel-{branch}-{gerrit-branch}'
@@ -96,3 +124,27 @@
       - archive:
          artifacts: >
            bazel-bin/plugins/{name}/{name}.jar, bazel-bin/plugins/{name}/{name}.jar-version, bazel-bin/plugins/{name}/{name}.json
+
+- view-template:
+    name: 'Plugins-{branch}'
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+    regex: 'plugin-.+-{branch}'
+
+- project:
+    name: 'plugin-views'
+    views:
+      - 'Plugins-{branch}'
+    branch:
+      - master
+      - stable-3.0
+      - stable-2.16
+      - stable-2.15
+      - stable-2.14
diff --git a/jenkins/gerrit-buck-bazel-plugin-uploadvalidator.yaml b/jenkins/gerrit-bazel-plugin-uploadvalidator.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-uploadvalidator.yaml
rename to jenkins/gerrit-bazel-plugin-uploadvalidator.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-verify-status.yaml b/jenkins/gerrit-bazel-plugin-verify-status.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-verify-status.yaml
rename to jenkins/gerrit-bazel-plugin-verify-status.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-websession-flatfile.yaml b/jenkins/gerrit-bazel-plugin-websession-flatfile.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-websession-flatfile.yaml
rename to jenkins/gerrit-bazel-plugin-websession-flatfile.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-wip.yaml b/jenkins/gerrit-bazel-plugin-wip.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-wip.yaml
rename to jenkins/gerrit-bazel-plugin-wip.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-x-docs.yaml b/jenkins/gerrit-bazel-plugin-x-docs.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-x-docs.yaml
rename to jenkins/gerrit-bazel-plugin-x-docs.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-zuul-status.yaml b/jenkins/gerrit-bazel-plugin-zuul-status.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-zuul-status.yaml
rename to jenkins/gerrit-bazel-plugin-zuul-status.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-zuul.yaml b/jenkins/gerrit-bazel-plugin-zuul.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-plugin-zuul.yaml
rename to jenkins/gerrit-bazel-plugin-zuul.yaml
diff --git a/jenkins/gerrit-buck-bazel-template.yaml b/jenkins/gerrit-bazel-template.yaml
similarity index 100%
rename from jenkins/gerrit-buck-bazel-template.yaml
rename to jenkins/gerrit-bazel-template.yaml
diff --git a/jenkins/gerrit-buck-bazel-plugin-template.yaml b/jenkins/gerrit-buck-bazel-plugin-template.yaml
deleted file mode 100644
index dc168ce..0000000
--- a/jenkins/gerrit-buck-bazel-plugin-template.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-- defaults:
-    name: plugin-template
-    targets: 'plugins/{name}:{name}'
-    wrappers:
-      - timeout:
-          timeout: 30
-          fail: true
-      - timestamps
-      - raw:
-          xml: <jenkins.plugins.logstash.LogstashBuildWrapper plugin="logstash@1.2.0"/>
-    properties:
-       - build-discarder:
-           days-to-keep: 20
-           artifact-days-to-keep: 20
-       - authorization:
-           anonymous:
-             - job-discover
-             - job-read
-             - job-extended-read
-    scm:
-      - git:
-         remotes:
-           - origin:
-               url: https://gerrit.googlesource.com/plugins/{name}
-           - gerrit:
-               url: https://gerrit.googlesource.com/gerrit
-         branches:
-           - origin/{branch}
-         submodule:
-           recursive: true
-         skip-tag: true
-
-    triggers:
-      - pollscm:
-          cron: 'H/50 * * * *'
-
-- job-template:
-    name: 'plugin-{name}-bazel-{branch}'
-    description: "Plugin {name} {branch} branch build with Bazel\n"
-    defaults: plugin-template
-    node: bazel-debian
-    class: plugins
-    project-name: plugins%2F{name}
-    builders:
-      - shell:
-         !include-raw: gerrit-bazel-build-plugin.sh
-      - shell:
-         !include-raw: gerrit-bazel-get-project-info.sh
-    publishers:
-      - archive:
-         artifacts: >
-           bazel-bin/plugins/{name}/{name}.jar, bazel-bin/plugins/{name}/{name}.jar-version, bazel-bin/plugins/{name}/{name}.json
-
-- view-template:
-    name: 'Plugins-{branch}'
-    view-type: list
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-      - build-button
-    regex: 'plugin-.+-{branch}'
-
-- project:
-    name: 'plugin-views'
-    views:
-      - 'Plugins-{branch}'
-    branch:
-      - master
-      - stable-3.0
-      - stable-2.16
-      - stable-2.15
-      - stable-2.14