commit 9fea0cd26b7f414bcaa81a2514ac59b649be7401
author Ray Milkey <ray@opennetworking.org> Fri Nov 15 12:52:21 2019 -0800
committer Carmelo Cascone <carmelo@opennetworking.org> Fri Nov 22 06:00:12 2019 +0000
tree f83c726bacfa1eb410fd5528a88ad5aee8fe4614
parent 4e5e77a660a4787af55ca2b5ae553beab83c6cc6

Use bazel 1.0.0 for onos-1.15

Change-Id: Ic2ff1ae891669549608c7e0694c69a3f231ecf26

jjb/onos/install-bazel.sh

diff --git a/jjb/onos/install-bazel.sh b/jjb/onos/install-bazel.sh
index 1912879..1c8b51c 100644
--- a/jjb/onos/install-bazel.sh
+++ b/jjb/onos/install-bazel.sh
@@ -7,7 +7,7 @@
 then
     BAZEL_VERSION="0.19.2"
 else
-    if [ ${GERRIT_BRANCH} == "master" -o ${GERRIT_BRANCH} == "onos-2.2" ]; then
+    if [ ${GERRIT_BRANCH} == "master" -o ${GERRIT_BRANCH} == "onos-2.2" -o ${GERRIT_BRANCH} == "onos-1.15" ]; then
         BAZEL_VERSION="1.0.0"
     else
         BAZEL_VERSION="0.24.1"
@@ -18,7 +18,7 @@
 then
     echo Installing bazel version ${BAZEL_VERSION}
     curl -L -o bazel.sh -s https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh
-    chmod +x bazel.sh 
+    chmod +x bazel.sh
     ./bazel.sh --user
 else
     echo Not installing bazel