Remove buck-references in Gitblit jobs
Change-Id: Ib5e7d9243e3de6e46027e26d45e7c4104d3ecd1a
diff --git a/jenkins/gerrit-bazel-plugin-gitblit.yaml b/jenkins/gerrit-bazel-plugin-gitblit.yaml
index f2d5e11..f61b803 100644
--- a/jenkins/gerrit-bazel-plugin-gitblit.yaml
+++ b/jenkins/gerrit-bazel-plugin-gitblit.yaml
@@ -1,6 +1,5 @@
- defaults:
name: 'plugin-gitblit'
- description: "GitBlit plugin {branch} branch build with BUCK\n"
wrappers:
- timeout:
timeout: 30
diff --git a/jenkins/gitblit-ant-build.sh b/jenkins/gitblit-ant-build.sh
index 5e0f087..eae45fe 100755
--- a/jenkins/gitblit-ant-build.sh
+++ b/jenkins/gitblit-ant-build.sh
@@ -1,17 +1,13 @@
#!/bin/bash -ex
git checkout origin/{branch}
-if [ -f BUILD ]
+
+GITBLIT_LINE=$(grep com.gitblit external_plugin_deps.bzl)
+if expr "$GITBLIT_LINE" : '.*[0-9\.]*-SNAPSHOT.*'
then
- GITBLIT_LINE=$(grep com.gitblit external_plugin_deps.bzl)
- if expr "$GITBLIT_LINE" : '.*[0-9\.]*-SNAPSHOT.*'
- then
- GITBLIT_REF=refs/heads/master
- else
- GITBLIT_REF=refs/tags/v$(expr "$GITBLIT_LINE" : '[^:]*:[^:]*:\([0-9\.]*\)')
- fi
+ GITBLIT_REF=refs/heads/master
else
- GITBLIT_REF=refs/tags/v$(expr "`grep com.gitblit lib/BUCK`" : '[^:]*:[^:]*:\([0-9\.]*\)')
+ GITBLIT_REF=refs/tags/v$(expr "$GITBLIT_LINE" : '[^:]*:[^:]*:\([0-9\.]*\)')
fi
git fetch gitblit $GITBLIT_REF && git checkout FETCH_HEAD
