remove local script installation of bazel
Change-Id: I2af16ab16aeb463a20a4f0a5ef36dbe0d352af15
diff --git a/jjb/onos/onos-bazel-release-build.sh b/jjb/onos/onos-bazel-release-build.sh
index f1f7c74..de54526 100644
--- a/jjb/onos/onos-bazel-release-build.sh
+++ b/jjb/onos/onos-bazel-release-build.sh
@@ -36,22 +36,6 @@
WIKI_USER="jenkins"
export WIKI_USER
-if [ ${GERRIT_BRANCH} == "onos-1.14" ]
-then
- curl -L -o bazel.sh https://github.com/bazelbuild/bazel/releases/download/0.15.2/bazel-0.15.2-installer-linux-x86_64.sh
-fi
-if [ ${GERRIT_BRANCH} == "onos-1.15" ]
-then
- curl -L -o bazel.sh https://github.com/bazelbuild/bazel/releases/download/0.17.1/bazel-0.17.1-installer-linux-x86_64.sh
-fi
-if [ ${GERRIT_BRANCH} == "master" ]
-then
- curl -L -o bazel.sh https://github.com/bazelbuild/bazel/releases/download/0.19.0/bazel-0.19.0-installer-linux-x86_64.sh
-fi
-chmod +x bazel.sh
-./bazel.sh --user
-PATH=$PATH:/home/jenkins/bin
-
# lock gerrit to prevent checkins
ssh -p 29418 gerrit.onosproject.org projectlock lock onos ${GERRIT_BRANCH}
diff --git a/jjb/onos/onos-release-build-verify.sh b/jjb/onos/onos-release-build-verify.sh
index c7f6c0e..58ffdd4 100644
--- a/jjb/onos/onos-release-build-verify.sh
+++ b/jjb/onos/onos-release-build-verify.sh
@@ -7,21 +7,6 @@
ONOS_ROOT=`pwd`
. tools/build/envDefaults
-if [ ${GERRIT_BRANCH} == "onos-1.14" ]
-then
- curl -L -o bazel.sh https://github.com/bazelbuild/bazel/releases/download/0.15.2/bazel-0.15.2-installer-linux-x86_64.sh
-fi
-if [ ${GERRIT_BRANCH} == "onos-1.15" ]
-then
- curl -L -o bazel.sh https://github.com/bazelbuild/bazel/releases/download/0.17.1/bazel-0.17.1-installer-linux-x86_64.sh
-fi
-if [ ${GERRIT_BRANCH} == "master" ]
-then
- curl -L -o bazel.sh https://github.com/bazelbuild/bazel/releases/download/0.19.0/bazel-0.19.0-installer-linux-x86_64.sh
-fi
-
-chmod +x bazel.sh
-./bazel.sh --user
PATH=$PATH:/home/jenkins/bin
# import GPG key
diff --git a/jjb/onos/onos-release-build.sh b/jjb/onos/onos-release-build.sh
index 78bdf85..d2bda26 100644
--- a/jjb/onos/onos-release-build.sh
+++ b/jjb/onos/onos-release-build.sh
@@ -7,9 +7,6 @@
ONOS_ROOT=`pwd`
. tools/build/envDefaults
-curl -L -o bazel.sh https://github.com/bazelbuild/bazel/releases/download/0.15.2/bazel-0.15.2-installer-linux-x86_64.sh
-chmod +x bazel.sh
-./bazel.sh --user
PATH=$PATH:/home/jenkins/bin
# import GPG key
diff --git a/jjb/onos/onos-run-stc-hag.sh b/jjb/onos/onos-run-stc-hag.sh
index 92a8856..45f6199 100644
--- a/jjb/onos/onos-run-stc-hag.sh
+++ b/jjb/onos/onos-run-stc-hag.sh
@@ -11,19 +11,7 @@
export JAVA_HOME=
. tools/dev/bash_profile
-if [ ${GERRIT_BRANCH} == "onos-1.14" ]
-then
- curl -L -o bazel.sh https://github.com/bazelbuild/bazel/releases/download/0.15.2/bazel-0.15.2-installer-linux-x86_64.sh
-fi
-if [ ${GERRIT_BRANCH} == "onos-1.15" ]
-then
- curl -L -o bazel.sh https://github.com/bazelbuild/bazel/releases/download/0.17.1/bazel-0.17.1-installer-linux-x86_64.sh
-fi
-if [ ${GERRIT_BRANCH} == "master" ]
-then
- curl -L -o bazel.sh https://github.com/bazelbuild/bazel/releases/download/0.19.0/bazel-0.19.0-installer-linux-x86_64.sh
-fi
-
+PATH=$PATH:/home/jenkins/bin
# always free the cell when exiting
function cleanup {
diff --git a/jjb/onos/onos-run-stc.sh b/jjb/onos/onos-run-stc.sh
index 30125ef..23f8d50 100644
--- a/jjb/onos/onos-run-stc.sh
+++ b/jjb/onos/onos-run-stc.sh
@@ -11,18 +11,7 @@
export JAVA_HOME=
. tools/dev/bash_profile
-if [ ${GERRIT_BRANCH} == "onos-1.14" ]
-then
- curl -L -o bazel.sh https://github.com/bazelbuild/bazel/releases/download/0.15.2/bazel-0.15.2-installer-linux-x86_64.sh
-fi
-if [ ${GERRIT_BRANCH} == "onos-1.15" ]
-then
- curl -L -o bazel.sh https://github.com/bazelbuild/bazel/releases/download/0.17.1/bazel-0.17.1-installer-linux-x86_64.sh
-fi
-if [ ${GERRIT_BRANCH} == "master" ]
-then
- curl -L -o bazel.sh https://github.com/bazelbuild/bazel/releases/download/0.19.0/bazel-0.19.0-installer-linux-x86_64.sh
-fi
+PATH=$PATH:/home/jenkins/bin
# always free the cell when exiting
function cleanup {