commit bf70cb63d6a9c008906fe742fb59e6b7a29becce
author Paladox none <thomasmulhall410@yahoo.com> Mon Jun 12 15:22:01 2017 +0000
committer Paladox none <thomasmulhall410@yahoo.com> Mon Jun 12 15:46:03 2017 +0000
tree 5eb625ab6f609946158a12c414c94aaab0346ab4
parent 6d64be402ed82d2d391efd4a0f4176d711be49e5

Fix building gitblit with buck

When building gitblit on the stable-2.12 branch it failed with

/tmp/hudson2548190402303314653.sh: line 4: bazel-genfiles/plugins/gitblit/gitblit.json: No such file or directory

Reason why it failed is because plugin info JSON file was never created.

This fixes it so that it will only be used on master and stable-2.14 branch.

Change-Id: I5d9a459b4802d5232fe3f66ebb8bd466d8db6cbe

jenkins/gerrit-buck-bazel-plugin-gitblit.yaml

diff --git a/jenkins/gerrit-buck-bazel-plugin-gitblit.yaml b/jenkins/gerrit-buck-bazel-plugin-gitblit.yaml
index 1ca8587..210c664 100644
--- a/jenkins/gerrit-buck-bazel-plugin-gitblit.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-gitblit.yaml
@@ -47,8 +47,6 @@
          !include-raw: gitblit-ant-build.sh
       - shell:
          !include-raw: gerrit-buck-build-plugin.sh
-      - shell:
-         !include-raw: gerrit-bazel-get-plugin-info.sh
     publishers:
       - archive:
          artifacts: 'buck-out/gen/plugins/gitblit/*gitblit*.jar*,buck-out/gen/plugins/gitblit/*gitblit*.json'
@@ -78,7 +76,7 @@
          !include-raw: gerrit-bazel-get-plugin-info.sh
     publishers:
       - archive:
-         artifacts: 'bazel-genfiles/plugins/gitblit/*gitblit*.jar*,buck-out/gen/plugins/gitblit/*gitblit*.json'
+         artifacts: 'bazel-genfiles/plugins/gitblit/*gitblit*.jar*,bazel-genfiles/plugins/gitblit/*gitblit*.json'
 
 
 - project:
@@ -98,4 +96,3 @@
           gerrit-branch:
             - master
             - stable-2.14
-