X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fcmake-sonar.sh;h=0bbf559e69277d0fcb41f388cfa2dc322fc9b36c;hb=b9d610a9e522d71a89d2daeb6f71b2bc2a71cdf7;hp=43e776f84234c47d67b9e795d69c8e35d4e350f9;hpb=c63e147ab10c5b00b2dfdac6df62ee9ef6dd8442;p=releng%2Fglobal-jjb.git

diff --git a/shell/cmake-sonar.sh b/shell/cmake-sonar.sh
index 43e776f8..0bbf559e 100644
--- a/shell/cmake-sonar.sh
+++ b/shell/cmake-sonar.sh
@@ -20,9 +20,20 @@ make_opts="${MAKE_OPTS:-}"
 
 set -ex -o pipefail
 
+export SET_JDK_VERSION="${SET_JDK_VERSION:-openjdk11}"
+echo "$SET_JDK_VERSION"
+GITHUB_RAW_BASE_URL="https://raw.githubusercontent.com"
+GITHUB_FILE="lfit/releng-global-jjb/master/shell/update-java-alternatives.sh"
+bash <(curl -s "${GITHUB_RAW_BASE_URL}/${GITHUB_FILE}")
+# shellcheck disable=SC1091
+source /tmp/java.env
+
 cd /tmp || exit 1
+SONAR_BASE_URL="https://binaries.sonarsource.com"
+SONAR_SCANER_PATH="Distribution/sonar-scanner-cli"
+SONAR_SCANER_CLI="sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux.zip"
 wget -q -O /tmp/sonar-scan.zip \
-    "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux.zip"
+    "${SONAR_BASE_URL}/${SONAR_SCANER_PATH}/${SONAR_SCANER_CLI}"
 unzip -q sonar-scan.zip
 sudo mv sonar-scanner-* /opt/sonar-scanner
 
@@ -37,8 +48,10 @@ cd "$build_dir" || exit 1
 # shellcheck disable=SC2086
 eval cmake -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" $cmake_opts ..
 
-/opt/build-wrapper/build-wrapper-linux-x86-64 --out-dir "$WORKSPACE/bw-output" \
-    make "$make_opts"
+# $make_opts may be empty.
+# shellcheck disable=SC2086
+/opt/build-wrapper/build-wrapper-linux-x86-64 --out-dir \
+    "$WORKSPACE/bw-output" make $make_opts
 
 /opt/sonar-scanner/bin/sonar-scanner \
     -Dsonar.projectKey="${PROJECT_KEY}" \