Merge pull request #2765 from dtcenter/feature_2757_SonarQube_token

Feature 2757 sonar qube token
dtcenter · Dec 14, 2023 · c8e4a17 · c8e4a17
2 parents ea9e543 + dde1255
commit c8e4a17
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 38 deletions.
diff --git a/internal/scripts/sonarqube/python.sonar-project.properties b/internal/scripts/sonarqube/python.sonar-project.properties
@@ -12,7 +12,7 @@ sonar.sourceEncoding=UTF-8
 
 #----- Default SonarQube server
 #sonar.host.url=http://localhost:9000
-sonar.host.url=http://needham.rap.ucar.edu:9000
+sonar.host.url=SONAR_SERVER_URL
 
-sonar.token=squ_dc703a41ce76b4c421b7e68dc79c6d211272900d
+sonar.token=SONAR_TOKEN_VALUE
 sonar.branch.name=develop
diff --git a/internal/scripts/sonarqube/run_nightly.sh b/internal/scripts/sonarqube/run_nightly.sh
@@ -20,9 +20,9 @@
 #=======================================================================
 
 # Constants
-#EMAIL_LIST="[email protected] [email protected] [email protected] [email protected] [email protected]"
-EMAIL_LIST="[email protected]"
+EMAIL_LIST="[email protected]"  # overridden by $MET_CRON_EMAIL_LIST_MET or $MET_CRON_EMAIL_LIST
 KEEP_DAYS=5
+GIT_REPO_NAME=MET
 
 function usage {
   echo
@@ -65,8 +65,12 @@ LOGFILE=${RUN_DIR}/run_sonarqube_${TODAY}.log
 # Run scan and check for bad return status
 ${SCRIPT_DIR}/run_sonarqube.sh ${1} > ${LOGFILE}
 if [[ $? -ne 0 ]]; then
-  echo "$0: The nightly SonarQube scan FAILED in `basename ${RUN_DIR}`." >> ${LOGFILE}
-  cat ${LOGFILE} | mail -s "MET SonarQube scan Failed for ${1} in `basename ${RUN_DIR}` (autogen msg)" ${EMAIL_LIST}
+  my_cmd="echo \$MET_CRON_EMAIL_LIST_${GIT_REPO_NAME}"
+  _EMAIL_LIST="$(eval $my_cmd)"
+  [ -z "$_EMAIL_LIST" ] && _EMAIL_LIST="$MET_CRON_EMAIL_LIST"
+  [ -z "$_EMAIL_LIST" ] && _EMAIL_LIST="$EMAIL_LIST"
+  echo "$0: The nightly SonarQube scanning for $GIT_REPO_NAME FAILED in `basename ${RUN_DIR}`." >> ${LOGFILE}
+  cat ${LOGFILE} | mail -s "$GIT_REPO_NAME SonarQube scanning failed for ${1} in `basename ${RUN_DIR}` (autogen msg)" ${_EMAIL_LIST}
   exit 1
 fi
 

diff --git a/internal/scripts/sonarqube/run_sonarqube.sh b/internal/scripts/sonarqube/run_sonarqube.sh
@@ -20,7 +20,8 @@
 #=======================================================================
 
 # Constants
-GIT_REPO="https://github.com/dtcenter/MET"
+[ -z "$GIT_REPO_NAME" ] && GIT_REPO_NAME=MET
+GIT_REPO="https://github.com/dtcenter/${GIT_REPO_NAME}"
 
 function usage {
         echo
@@ -34,36 +35,35 @@ if [[ $# -lt 1 ]]; then usage; exit; fi
 
 # Check that SONARQUBE_WRAPPER_BIN is defined
 if [ -z ${SONARQUBE_WRAPPER_BIN} ]; then
-  which build-wrapper-linux-x86-64 2> /dev/null
-  if [ $? -eq 0 ]; then
-    SONARQUBE_WRAPPER_BIN=$(which build-wrapper-linux-x86-64 2> /dev/null)
-  else
-    which build-wrapper 2> /dev/null
-    if [ $? -eq 0 ]; then
-      SONARQUBE_WRAPPER_BIN=$(which build-wrapper 2> /dev/null)
-    else
+  SONAR_WRAPPER=$(which build-wrapper-linux-x86-64 2> /dev/null)
+  if [ $? -ne 0 ]; then
+    SONAR_WRAPPER=$(which build-wrapper 2> /dev/null)
+    if [ $? -ne 0 ]; then
       echo "ERROR: SONARQUBE_WRAPPER_BIN must be set"
       exit 1
     fi
   fi
+else
+  SONAR_WRAPPER=${SONARQUBE_WRAPPER_BIN}/build-wrapper-linux-x86-64
 fi
-if [ ! -e ${SONARQUBE_WRAPPER_BIN} ]; then
-  echo "ERROR: SONARQUBE_WRAPPER_BIN (${SONARQUBE_WRAPPER_BIN}) does not exist"
+if [ ! -e ${SONAR_WRAPPER} ]; then
+  echo "ERROR: ${SONAR_WRAPPER} does not exist"
   exit 1
 fi
 
 # Check that SONARQUBE_SCANNER_BIN is defined
+SCANNER_NAME=sonar-scanner
 if [ -z ${SONARQUBE_SCANNER_BIN} ]; then
-  which sonar-scanner 2> /dev/null
-  if [ $? -eq 0 ]; then
-    SONARQUBE_SCANNER_BIN=$(which sonar-scanner 2> /dev/null)
-  else
+  SONAR_SCANNER=$(which $SCANNER_NAME 2> /dev/null)
+  if [ $? -ne 0 ]; then
     echo "ERROR: SONARQUBE_SCANNER_BIN must be set"
     exit 1
   fi
+else
+  SONAR_SCANNER=${SONARQUBE_SCANNER_BIN}/$SCANNER_NAME
 fi
-if [ ! -e ${SONARQUBE_SCANNER_BIN} ]; then
-  echo "ERROR: SONARQUBE_SCANNER_BIN (${SONARQUBE_SCANNER_BIN}) does not exist"
+if [ ! -e $SONAR_SCANNER ]; then
+  echo "ERROR: SONAR_SCANNER (${SONAR_SCANNER}) does not exist"
   exit 1
 fi
 
@@ -116,7 +116,8 @@ run_command "./configure --prefix=`pwd` \
             --enable-modis \
             --enable-mode_graphics \
             --enable-lidar2nc \
-            --enable-python"
+            --enable-python \
+            --enable-ugrid"
 
 # Set the build id
 #BUILD_ID="MET-${1}"
@@ -125,23 +126,31 @@ SONAR_PROPERTIES=sonar-project.properties
 
 # Copy sonar-project.properties for Python code
 [ -e $SONAR_PROPERTIES ] && rm $SONAR_PROPERTIES
-cp -p $SCRIPT_DIR/python.sonar-project.properties $SONAR_PROPERTIES
+[ -z "$SONAR_SERVER_URL" ] && SONAR_SERVER_URL="http://localhost:9000"
+if [ -z "$SONAR_TOKEN_VALUE" ]; then
+  echo "  == ERROR == SONAR_TOKEN_VALUE is not defined"
+  exit 1
+else
+  sed -e "s|SONAR_TOKEN_VALUE|$SONAR_TOKEN_VALUE|" -e "s|SONAR_SERVER_URL|$SONAR_SERVER_URL|" $SCRIPT_DIR/python.sonar-project.properties > $SONAR_PROPERTIES
 
-# Run SonarQube scan for Python code
-run_command "${SONARQUBE_SCANNER_BIN}/sonar-scanner"
+  # Run SonarQube scan for Python code
+  run_command "$SONAR_SCANNER"
 
-# Copy sonar-project.properties for C/C++ code
-[ -e $SONAR_PROPERTIES ] && rm $SONAR_PROPERTIES
-cp -p $SCRIPT_DIR/$SONAR_PROPERTIES .
+  # Copy sonar-project.properties for C/C++ code
+  [ -e $SONAR_PROPERTIES ] && rm $SONAR_PROPERTIES
+  sed -e "s|SONAR_TOKEN_VALUE|$SONAR_TOKEN_VALUE|" -e "s|SONAR_SERVER_URL|$SONAR_SERVER_URL|" $SCRIPT_DIR/sonar-project.properties > $SONAR_PROPERTIES
 
-# Run SonarQube clean
-run_command "make clean"
+  # Run SonarQube clean
+  run_command "make clean"
 
-# Run SonarQube make
-run_command "${SONARQUBE_WRAPPER_BIN}/build-wrapper-linux-x86-64 --out-dir $SONARQUBE_OUT_DIR make"
+  # Run SonarQube make
+  run_command "$SONAR_WRAPPER --out-dir $SONARQUBE_OUT_DIR make"
 
-# Run SonarQube scan for C/C++ code
-run_command "${SONARQUBE_SCANNER_BIN}/sonar-scanner"
+  # Run SonarQube scan for C/C++ code
+  run_command "$SONAR_SCANNER"
+
+  [ -e $SONAR_PROPERTIES ] && rm $SONAR_PROPERTIES
+fi
 
 # Run SonarQube report generator to make a PDF file
 #TODAY=`date +%Y%m%d`
diff --git a/internal/scripts/sonarqube/sonar-project.properties b/internal/scripts/sonarqube/sonar-project.properties
@@ -12,7 +12,7 @@ sonar.sourceEncoding=UTF-8
 
 #----- Default SonarQube server
 #sonar.host.url=http://localhost:9000
-sonar.host.url=http://needham.rap.ucar.edu:9000
+sonar.host.url=SONAR_SERVER_URL
 
-sonar.token=squ_dc703a41ce76b4c421b7e68dc79c6d211272900d
+sonar.token=SONAR_TOKEN_VALUE
 sonar.branch.name=develop