Merge pull request #711 from utPLSQL/build/sonarpr

jgebal · web-flow · commit 71a4d33eb040 · 2018-07-14T11:36:18.000+01:00
Added ability to generate a sonar branches pull request analysis
diff --git a/.travis.yml b/.travis.yml
@@ -12,9 +12,6 @@ addons:
     organization: utplsql
     token:
       secure: ${SONAR_TOKEN}
-    branches:
-      - develop
-      - master
 
 services:
   - docker
@@ -66,6 +63,8 @@ cache:
 before_install:
   #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
+  #Allow for sonar to blame issues
+  - git fetch --unshallow
   # download latest utPLSQL release
   #- curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip" | sed 's/"//g')
   - git clone --depth=1 --branch=${SELFTESTING_BRANCH:-master} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR
@@ -94,7 +93,7 @@ before_script:
 script:
   - if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/validate_report_files.sh; fi
-  - if [[ ! $TRAVIS_TAG ]] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then sonar-scanner; fi
+  - if [[ ! $TRAVIS_TAG ]] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ]; then bash .travis/run_sonar_scanner.sh; fi
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/coveralls_uploader.sh; fi
 
 notifications:
diff --git a/.travis/run_sonar_scanner.sh b/.travis/run_sonar_scanner.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+
+#Run Sonar based on conditions
+
+MAIN_DEV_BRANCH="develop"
+
+BRANCH_SONAR_PROPERTY="sonar.branch.name"
+BRANCH_SONAR_TARGET_PROPERTY="sonar.branch.target"
+
+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=""
+    echo "BRANCH=$BRANCH"
+else 
+    BRANCH=$TRAVIS_PULL_REQUEST_BRANCH
+    PR_BRANCH=$TRAVIS_BRANCH
+    echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$TRAVIS_PULL_REQUEST, BRANCH=$BRANCH"
+
+fi   
+
+
+#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 "" >> sonar-project.properties
+    if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then 
+        echo "Updating sonar properties to include branch ${BRANCH}"
+        add_sonar_property "${BRANCH_SONAR_PROPERTY}" "${BRANCH}" 
+        add_sonar_property "${BRANCH_SONAR_TARGET_PROPERTY}" "${MAIN_DEV_BRANCH}" 
+     else
+       echo "Updating sonar properties to include pull request ${BRANCH}"
+       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
+
+#Execute Sonar scanner
+sonar-scanner
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -19,5 +19,9 @@ 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
+
 # Encoding of the source code. Default is default system encoding
 #sonar.sourceEncoding=UTF-8
diff --git a/source/api/ut.pkb b/source/api/ut.pkb
@@ -103,7 +103,8 @@ create or replace package body ut is
       raise e_package_invalidated;
     end if;
   end;
-
+  
+  
   procedure run_autonomous(
     a_paths ut_varchar2_list,
     a_reporter ut_reporter_base,
