Install bazel and Sonar CLI tools properly
Change-Id: I102969fcc92a43e9db8f6979c508aa7dd9eddf5b
diff --git a/jjb/onos/onos-sonar.sh b/jjb/onos/onos-sonar.sh
index c89756f..5bf010a 100644
--- a/jjb/onos/onos-sonar.sh
+++ b/jjb/onos/onos-sonar.sh
@@ -6,21 +6,18 @@
ONOS_ROOT=`pwd`
. tools/build/envDefaults
+PATH=$PATH:/home/jenkins/bin
+
# download and install Sonar scanner
SONAR_SCANNER_VERSION=3.0.3.778
-curl -L -o /tmp/sonar-scanner-cli.zip -X GET https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION.zip
+curl -L -o /tmp/sonar-scanner-cli.zip -X GET http://central.maven.org/maven2/org/sonarsource/scanner/cli/sonar-scanner-cli/$SONAR_SCANNER_VERSION/sonar-scanner-cli-$SONAR_SCANNER_VERSION.zip
unzip /tmp/sonar-scanner-cli.zip
# Configure ONOS specific properties
echo "sonar.host.url=https://sonar.onosproject.org" >>sonar-scanner-$SONAR_SCANNER_VERSION/conf/sonar-scanner.properties
-# Be sure buck is installed
-onos-buck --version
-
# Generate coverage data
tools/build/onos-prepare-sonar
# Upload coverage to Sonar
sonar-scanner-$SONAR_SCANNER_VERSION/bin/sonar-scanner
-
-