Update master branch to bazel 1.2.1
Change-Id: Ib1c07917f0296a850e20b68373425cba361b6485
diff --git a/jjb/onos/install-bazel.sh b/jjb/onos/install-bazel.sh
index 4b57afa..147b36d 100644
--- a/jjb/onos/install-bazel.sh
+++ b/jjb/onos/install-bazel.sh
@@ -3,16 +3,20 @@
# exit on errors
set -eu -o pipefail
-if [ ${GERRIT_BRANCH} == "onos-1.14" ]
-then
+BAZEL_VERSION="none"
+if [ ${GERRIT_BRANCH} == "onos-1.14" ]; then
BAZEL_VERSION="0.19.2"
-else
- if [ ${GERRIT_BRANCH} == "master" -o ${GERRIT_BRANCH} == "onos-2.2" -o ${GERRIT_BRANCH} == "onos-2.3" -o ${GERRIT_BRANCH} == "onos-1.15" ]; then
- BAZEL_VERSION="1.0.0"
- else
- BAZEL_VERSION="0.24.1"
- fi
fi
+if [ ${GERRIT_BRANCH} == "onos-2.0" -o ${GERRIT_BRANCH} == "onos-2.1" ]; then
+ BAZEL_VERSION="0.24.1"
+fi
+if [ ${GERRIT_BRANCH} == "onos-2.2" -o ${GERRIT_BRANCH} == "onos-2.3" -o ${GERRIT_BRANCH} == "onos-1.15" ]; then
+ BAZEL_VERSION="1.0.0"
+fi
+if [ ${GERRIT_BRANCH} == "master" ]; then
+ BAZEL_VERSION="1.2.1"
+fi
+
if [ ${BAZEL_VERSION} != "none" ]
then