Update sonar properties

lwasylow · lwasylow · commit 2d09f43969c4 · 2018-07-12T19:12:36.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -64,6 +64,8 @@ cache:
     - $MAVEN_CFG
 
 before_install:
+  #debug
+  - if [[ ! $TRAVIS_TAG ]] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ]; then bash .travis/run_sonar_scanner.sh; fi
   #The update_project_version.sh is done before deployment to validate that the change of project files does not break installation
   - bash .travis/update_project_version.sh
   # download latest utPLSQL release
diff --git a/.travis/run_sonar_scanner.sh b/.travis/run_sonar_scanner.sh
@@ -1,14 +1,21 @@
 #!/usr/bin/env bash
 
 MAIN_DEV_BRANCH="develop"
+
 BRANCH_SONAR_PROPERTY="sonar.branch.name"
 BRANCH_SONAR_TARGET_PROPERTY="sonar.branch.target"
 
-function add_sonar_property {
+PR_SONAR_BRANCH_PROPERTY="sonar.pullrequest.branch"
+PR_KEY_PROPERTY="sonar.pullrequest.key"
+PR_SONAR_BASE_PROPERTY="sonar.pullrequest.base"
+PR_SONAR_TOKEN_PROPERTY="sonar.pullrequest.github.token.secured"
 
+#Add property to file
+function add_sonar_property {
     echo "$1=$2" >> sonar-project.properties
 }
 
+
 if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then 
     BRANCH=$TRAVIS_BRANCH;
     PR_BRANCH=""
@@ -20,25 +27,28 @@ else
 
 fi   
 
-add_sonar_property "sonar.pullrequest.github.token.secured" "${GITHUB_TRAVISCI_TOKEN}"
 
-# We are updating sonar_properties only when is not a develop
-# if its a pull request we will create a separate 
+#Are we running on develop branch ?
+echo "Check if we running from develop or on branch"
 if [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [[ ! "${BRANCH}" =~ ^(release/v[0-9]+\.[0-9]+\.[0-9]+.*|"${MAIN_DEV_BRANCH}")$ ]]; then
-    echo "Updating sonar properties to include branch name"
-  
-    add_sonar_property "${BRANCH_SONAR_PROPERTY}" "${BRANCH}" 
     
-    if [ ! -z "$PR_BRANCH" ];  then
-        echo "Updating sonar properties to include pr target branch name"
-	     add_sonar_property "${BRANCH_SONAR_TARGET_PROPERTY}" "${PR_BRANCH}" 
-    else
+    if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then 
+        echo "Updating sonar properties to include branch name"
+        add_sonar_property "${BRANCH_SONAR_PROPERTY}" "${BRANCH}" 
         add_sonar_property "${BRANCH_SONAR_TARGET_PROPERTY}" "${MAIN_DEV_BRANCH}" 
-    fi
-         
+     else
+       echo "Updating sonar properties to include pull request name"
+       add_sonar_property "${PR_SONAR_TOKEN_PROPERTY}" "${GITHUB_TRAVISCI_TOKEN}"
+       add_sonar_property "${PR_SONAR_BRANCH_PROPERTY}" "${BRANCH}"
+       add_sonar_property "${PR_KEY_PROPERTY}" "${PR}"
+       add_sonar_property "${PR_SONAR_BASE_PROPERTY}" "${PR_BRANCH}"
+     fi    
 else
     echo "No need to update sonar we building on release or develop"
 fi
 
+#debug
+cat sonar-project.properties
+
 #Execute Sonar scanner
-sonar-scanner
+#sonar-scanner
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -19,6 +19,7 @@ sonar.projectDescription=PL/SQL Unit Testing Framework
 sonar.plsql.file.suffixes=sql,tab,pkb,tpb
 sonar.language=plsql
 
+sonar.pullrequest.provider=github
 sonar.pullrequest.github.endpoint=https://api.github.com/
 sonar.pullrequest.github.repository=utPLSQL/utPLSQL
 
