Build Groovy scripting of Gerrit v2.14/15

Change-Id: I12f78ba437d525c12a883554f2bd9a4f434a915d
diff --git a/jenkins/gerrit-buck-bazel-plugin-groovy-provider.yaml b/jenkins/gerrit-buck-bazel-plugin-groovy-provider.yaml
index eefe8b2..89c8475 100644
--- a/jenkins/gerrit-buck-bazel-plugin-groovy-provider.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-groovy-provider.yaml
@@ -6,10 +6,8 @@
             - stable-2.13
             - stable-2.12
             - stable-2.11
-      - 'plugin-scripting-{name}-bazel-{branch}-{gerrit-branch}':
+      - 'plugin-scripting-{name}-bazel-{branch}':
           branch:
             - master
-          gerrit-branch:
-            - master
             - stable-2.15
             - stable-2.14
diff --git a/jenkins/gerrit-buck-bazel-plugin-scripting-template.yaml b/jenkins/gerrit-buck-bazel-plugin-scripting-template.yaml
index 5493f64..38e82f9 100644
--- a/jenkins/gerrit-buck-bazel-plugin-scripting-template.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-scripting-template.yaml
@@ -47,6 +47,30 @@
            buck-out/gen/plugins/{name}/{name}.jar*
 
 - job-template:
+    name: 'plugin-scripting-{name}-bazel-{branch}'
+    description: "Plugin scripting/{name}/{branch} Bazel build for Gerrit\n"
+    defaults: plugin-scripting-template
+    scm:
+      - git:
+         remotes:
+           - origin:
+               url: https://gerrit.googlesource.com/plugins/scripting/{name}
+           - gerrit:
+               url: https://gerrit.googlesource.com/gerrit
+         branches:
+           - origin/{branch}
+         skip-tag: true
+    builders:
+      - shell:
+         !include-raw: gerrit-bazel-build-plugin.sh
+      - shell:
+         !include-raw: gerrit-bazel-get-scripting-plugin-info.sh
+    publishers:
+      - archive:
+         artifacts: >
+           bazel-genfiles/plugins/{name}/{name}.jar*,bazel-genfiles/plugins/{name}/{name}.json
+
+- job-template:
     name: 'plugin-scripting-{name}-bazel-{branch}-{gerrit-branch}'
     description: "Plugin scripting/{name}/{branch} Bazel build for Gerrit/{gerrit-branch}\n"
     defaults: plugin-scripting-template