utPLSQL · jgebal · Jul 22, 2018 · May 4, 2018 · May 4, 2018 · May 4, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -5,16 +5,13 @@ addons:
   apt:
     packages:
       - unzip
-      # Java8 Required for Sonar and SQLCL
-      - oracle-java8-installer
-      - oracle-java8-set-default
+      # Java9 Required for Sonar and SQLCL
+      - oracle-java9-installer
+      - oracle-java9-set-default
   sonarcloud:
     organization: utplsql
     token:
       secure: ${SONAR_TOKEN}
-    branches:
-      - develop
-      - master
 
 services:
   - docker
@@ -46,14 +43,14 @@ env:
     - DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}"
     #utPLSQL released version directory
     - UTPLSQL_DIR="utPLSQL_latest_release"
-    - SELFTESTING_BRANCH="develop"
+    - SELFTESTING_BRANCH=${TRAVIS_BRANCH}
     - UTPLSQL_CLI_VERSION="3.1.0"
     # Maven
     - MAVEN_HOME=/usr/local/maven
     - MAVEN_CFG=$HOME/.m2
   matrix:
-    - ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}"  CONNECTION_STR='127.0.0.1:1521/XE'       DOCKER_OPTIONS='--shm-size=1g'
-    - ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2}" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
+    - ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}"   CONNECTION_STR='127.0.0.1:1521/XE'       DOCKER_OPTIONS='--shm-size=1g'
+    - ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2}"  CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
     - ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2}" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
 
 cache:
@@ -64,12 +61,10 @@ cache:
     - $MAVEN_CFG
 
 before_install:
-  #The update_project_version is done before deployment to validate that the change of project files does not break installation
+  #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
-  - git config --global user.email "builds@travis-ci.com"
-  - git config --global user.name "${UTPLSQL_BUILD_USER_NAME}"
-  - git remote rm origin
-  - git remote add origin https://${github_api_token}@github.com/${UTPLSQL_REPO}
+  #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
@@ -81,49 +76,62 @@ install:
   - unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli
   # Get ojdbc via maven
   - bash .travis/maven_cfg.sh
-  - pip install mkdocs
   - bash .travis/install_sqlcl.sh
   - sudo mkdir -p /dev/pdbs
   - sudo chmod -R 777 /dev/pdbs
+  - df -h
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/start_db.sh; fi
   - df -h
 
 before_script:
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/install.sh; fi
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/install_utplsql_release.sh; fi
-  - if [[ ! $TRAVIS_TAG ]]; then bash .travis/create_additional_grants_for_old_tests.sh; fi
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_examples.sh; fi
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_old_tests.sh; fi
 
 script:
   - if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi
-  - if [[ ! $TRAVIS_TAG ]] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then sonar-scanner; fi
+  - if [[ ! $TRAVIS_TAG ]]; then bash .travis/validate_report_files.sh; 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
-  - bash .travis/build_docs.sh
-  - if [[ ! $TRAVIS_TAG ]]; then bash .travis/push_release_version.sh; fi
-  - bash .travis/push_docs_to_gh_pages.sh
-
-before_deploy:
-  - bash .travis/build_release_archive.sh
-
-deploy:
-  provider: releases
-  api_key: $github_api_token
-  file:
-     - utPLSQL.zip
-     - utPLSQL.tar.gz
-     - utPLSQL.zip.md5
-     - utPLSQL.tar.gz.md5
-  skip_cleanup: true
-  on:
-     repo: ${UTPLSQL_REPO}
-     tags: true
-     # when building from a release tag, use only first job "#xxx.1" to publish artifacts
-     condition: "${TRAVIS_JOB_NUMBER} =~ \\.1$"
 
 notifications:
   slack:
     rooms:
       - secure: "nemt9n2y5sVCAKqa/s7JDQ8AcM59Xu/XbH/RkMOXvPgc+KtR8lBtVD1LkvJ5BaQhqgjuDT7DNt/uisQJ7k6a2OsrVFbnkypZ1hCvntOBpJyoSpD/YL1X8a9GbGojuJcph0BX76KN21LaOVdyOfY0TSlw53XiYWS8iL5HtjpWCbIwHL1SJ8JT8mhdT4hDoUWZjcZ4s4bLH6BQm4un/bMQOmB4sDoCeg4CllJwxgkswVF7OHpOFjgPetvUp7ps8b/Rj8en6zCj9drb0SVbXFgumo2Wd1bC3HHZB8MAZU0kuEV5VgUdum6EelUL5yfB72hssNQA0+CaT3HjBFkTlqWYJmjC4/xyGN3sseiW82T9FDY0g0GAGayNRW+QSiTQ1hbJEcAnNe0GrBUdRsgXdI6COd76YP5VxzRSF6H7niLfgCZdKbIivKUd1o+wBhuyJmqCFIkRWmT38tMGJqJAzbY1jq5gQXbb6E7gt+KdTjlSjcnJYf7XI7zqm+BRr+fbA0ixfXHvfqOBgZN6g08y9nPlDnIjtSF2NSdrj2zqYQAtKuWSOD1bnTyfDJyrtK7OLffZcMYD5Bcss4c8op8tP7MGTjt1S046SJocboh6H4c/nTokpoMRsWs6MKRdebl8C2RObGf5FebSOJg+oh2ZYS5Z/G9GshiY2BD/81+Hc4Miacc="
     on_success: change
     on_failure: always
+
+jobs:
+  include:
+    - stage: deploy
+      env: ORACLE_VERSION="none"
+      before_install: skip
+      install:
+        - pip install mkdocs
+      before_script: skip
+      script: 
+        - if [[ ($TRAVIS_BRANCH == develop) && ($TRAVIS_PULL_REQUEST == false) ]]; then bash .travis/trigger_travis.sh $TRAVIS_ACCESS_TOKEN; fi
+        - #The update_project_version.sh needs to be done before pushing changes to develop branch
+        - bash .travis/update_project_version.sh
+        - git config --global user.email "builds@travis-ci.com"
+        - git config --global user.name "${UTPLSQL_BUILD_USER_NAME}"
+        - git remote rm origin
+        - git remote add origin https://${github_api_token}@github.com/${UTPLSQL_REPO}
+        - if [[ ! $TRAVIS_TAG ]]; then bash .travis/push_release_version.sh; fi
+        - bash .travis/build_docs.sh
+        - bash .travis/push_docs_to_gh_pages.sh
+      before_deploy:
+        - bash .travis/build_release_archive.sh
+      deploy:
+        provider: releases
+        api_key: $github_api_token
+        file:
+           - utPLSQL.zip
+           - utPLSQL.tar.gz
+           - utPLSQL.zip.md5
+           - utPLSQL.tar.gz.md5
+        skip_cleanup: true
+        on:
+           repo: ${UTPLSQL_REPO}
+           tags: true
diff --git a/.travis/create_additional_grants_for_old_tests.sh b/.travis/create_additional_grants_for_old_tests.sh
diff --git a/.travis/install.sh b/.travis/install.sh
@@ -11,6 +11,37 @@ alter session set plsql_warnings = 'ENABLE:ALL', 'DISABLE:(5004,5018,6000,6001,6
 @install_headless.sql $UT3_OWNER $UT3_OWNER_PASSWORD
 SQL
 
+#uninstall core of utplsql
+"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
+set feedback off
+set verify off
+
+@uninstall_all.sql $UT3_OWNER
+declare
+  v_leftover_objects_count integer;
+begin
+  select sum(cnt)
+    into v_leftover_objects_count
+    from (select count(1) cnt from dba_objects where owner = '$UT3_OWNER'
+    union all
+    select count(1) cnt from dba_synonyms where table_owner = '$UT3_OWNER'
+    );
+  if v_leftover_objects_count > 0 then
+    raise_application_error(-20000, 'Not all objects were successfully uninstalled - leftover objects count='||v_leftover_objects_count);
+  end if;
+end;
+/
+SQL
+
+#reinstall core of utplsql
+"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
+set feedback off
+set verify off
+
+alter session set plsql_warnings = 'ENABLE:ALL', 'DISABLE:(5004,5018,6000,6001,6003,6009,6010,7206)';
+@install.sql $UT3_OWNER
+SQL
+
 #additional privileges to run scripted tests
 "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
 set feedback on
@@ -38,3 +69,30 @@ revoke execute on dbms_crypto from $UT3_TESTER;
 grant create job to $UT3_TESTER;
 exit
 SQL
+
+#additional privileges to run tests
+"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
+set feedback on
+--needed for Mystats script to work
+grant select any dictionary to $UT3_OWNER;
+--Needed for testing a coverage outside ut3_owner.
+grant create any procedure, drop any procedure, execute any procedure to $UT3_OWNER;
+
+exit
+SQL
+
+#Create additional users
+"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
+set feedback off
+@create_utplsql_owner.sql $UT3_USER $UT3_USER_PASSWORD $UT3_TABLESPACE
+
+exit
+SQL
+
+#Grant UT3 framework to UT3$USER#
+"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
+set feedback off
+@create_user_grants.sql $UT3_OWNER $UT3_USER
+
+exit
+SQL
diff --git a/.travis/lib/xml_validator.jar b/.travis/lib/xml_validator.jar
diff --git a/.travis/push_docs_to_gh_pages.sh b/.travis/push_docs_to_gh_pages.sh
@@ -17,87 +17,85 @@ PAGES_TARGET_BRANCH="gh-pages"
 LATEST_DOCS_BRANCH="develop"
 #  TRAVIS_* variables are set by travis directly and only need to be if testing externally
 
-# Since we are running job matrix, only thie first job slave will need to do the work
-if [[ "${TRAVIS_JOB_NUMBER}" =~ \.1$ ]]; then
-  # We don't want a pull request automatically updating the repository
-  if [ "$TRAVIS_PULL_REQUEST" == "false" ] && { [ "${CURRENT_BRANCH}" == "${LATEST_DOCS_BRANCH}" ] || [ -n "${TRAVIS_TAG}" ]; }; then
+# We don't want a pull request automatically updating the repository
+if [ "$TRAVIS_PULL_REQUEST" == "false" ] && { [ "${CURRENT_BRANCH}" == "${LATEST_DOCS_BRANCH}" ] || [ -n "${TRAVIS_TAG}" ]; }; then
 
-    # ENV Variable checks are to help with configuration troubleshooting, they silently exit with unique message.
-    # Anyone one of them not set can be used to turn off this functionality.
+  # ENV Variable checks are to help with configuration troubleshooting, they silently exit with unique message.
+  # Anyone one of them not set can be used to turn off this functionality.
 
-    # If a version of the project is not defined
-    [[ -n "${UTPLSQL_VERSION}" ]] || { echo "variable UTPLSQL_VERSION is not defines or missing value";  exit 0; }
-    # Fail if the markdown documentation is not present.
-    [[ -f ./docs/index.md ]] || { echo "file docs/index.md not found";  exit 1; }
+  # If a version of the project is not defined
+  [[ -n "${UTPLSQL_VERSION}" ]] || { echo "variable UTPLSQL_VERSION is not defines or missing value";  exit 0; }
+  # Fail if the markdown documentation is not present.
+  [[ -f ./docs/index.md ]] || { echo "file docs/index.md not found";  exit 1; }
 
-    # Save some useful information
-    SHA=`git rev-parse --verify HEAD`
+  # Save some useful information
+  SHA=`git rev-parse --verify HEAD`
 
-    # clone the repository and switch to PAGES_TARGET_BRANCH branch
-    mkdir pages
-    cd pages
-    git clone https://${github_api_token}@github.com/${UTPLSQL_REPO} .
+  # clone the repository and switch to PAGES_TARGET_BRANCH branch
+  mkdir pages
+  cd pages
+  git clone https://${github_api_token}@github.com/${UTPLSQL_REPO} .
 
-    PAGES_BRANCH_EXISTS=$(git ls-remote --heads origin ${PAGES_TARGET_BRANCH})
+  PAGES_BRANCH_EXISTS=$(git ls-remote --heads origin ${PAGES_TARGET_BRANCH})
 
-    if [ -n "$PAGES_BRANCH_EXISTS" ] ; then
-      echo "Pages Branch Found"
-      git checkout ${PAGES_TARGET_BRANCH}
-    else
-      echo "Creating Pages Branch"
-      git checkout --orphan ${PAGES_TARGET_BRANCH}
-      git rm -rf .
-    fi
-    #clear out develop documentation directory and copy docs contents to it.
-    echo "updating 'develop' directory"
-    mkdir -p develop
-    rm -rf develop/**./* || exit 0
-    cp -a ../docs/. ./develop
-    # If a Tagged Build then copy to it's own directory as well and to the 'latest' release directory
-    if [ -n "$TRAVIS_TAG" ]; then
-     echo "Creating ${UTPLSQL_VERSION}"
-     mkdir -p ${UTPLSQL_VERSION}
-     rm -rf ${UTPLSQL_VERSION}/**./* || exit 0
-     cp -a ../docs/. ${UTPLSQL_VERSION}
-     echo "Populating 'latest' directory"
-     mkdir -p latest
-     rm -rf latest/**./* || exit 0
-     cp -a ../docs/. latest
-    fi
-    # Stage changes for commit
-    git add .
-    #Check if there are doc changes, if none exit the script
-    if [[ -z `git diff HEAD --exit-code` ]] && [ -n "${PAGES_BRANCH_EXISTS}" ] ; then
-      echo "No changes to docs detected."
-      exit 0
-    fi
-    #Changes where detected, so we need to update the version log.
-    now=$(date +"%d %b %Y - %r")
-    if [ ! -f index.md ]; then
-      echo "---" >>index.md
-      echo "layout: default" >>index.md
-      echo "---" >>index.md
-      echo "<!-- Auto generated from .travis/push_docs_to_gh_pages.sh -->" >>index.md
-      echo "# Documentation versions" >>index.md
-      echo "" >>index.md
-      echo "" >>index.md #- 7th line - placeholder for latest release doc
-      echo "" >>index.md #- 8th line - placeholder for develop branch doc
-      echo "" >>index.md
-      echo "## Released Version Doc History" >>index.md
-      echo "" >>index.md
-    fi
-    #If build running on a TAG - it's a new release - need to add it to documentation
-    if [ -n "${TRAVIS_TAG}" ]; then
-      sed -i '7s@.*@'" - [Latest ${TRAVIS_TAG} documentation](latest/) - Created $now"'@' index.md
-      #add entry to the top of version history (line end of file - ## Released Version Doc History
-      sed -i '12i'" - [${TRAVIS_TAG} documentation](${UTPLSQL_VERSION}/) - Created $now" index.md
-    fi
-    #replace 4th line in log
-    sed -i '8s@.*@'" - [Latest development version](develop/) - Created $now"'@'  index.md
-    #Add and Commit the changes back to pages repo.
-    git add .
-    git commit -m "Deploy to gh-pages branch: base commit ${SHA}"
-    # Now that we're all set up, we can push.
-    git push --quiet origin HEAD:${PAGES_TARGET_BRANCH}
+  if [ -n "$PAGES_BRANCH_EXISTS" ] ; then
+    echo "Pages Branch Found"
+    git checkout ${PAGES_TARGET_BRANCH}
+  else
+    echo "Creating Pages Branch"
+    git checkout --orphan ${PAGES_TARGET_BRANCH}
+    git rm -rf .
   fi
+  #clear out develop documentation directory and copy docs contents to it.
+  echo "updating 'develop' directory"
+  mkdir -p develop
+  rm -rf develop/**./* || exit 0
+  cp -a ../docs/. ./develop
+  # If a Tagged Build then copy to it's own directory as well and to the 'latest' release directory
+  if [ -n "$TRAVIS_TAG" ]; then
+   echo "Creating ${UTPLSQL_VERSION}"
+   mkdir -p ${UTPLSQL_VERSION}
+   rm -rf ${UTPLSQL_VERSION}/**./* || exit 0
+   cp -a ../docs/. ${UTPLSQL_VERSION}
+   echo "Populating 'latest' directory"
+   mkdir -p latest
+   rm -rf latest/**./* || exit 0
+   cp -a ../docs/. latest
+  fi
+  # Stage changes for commit
+  git add .
+  #Check if there are doc changes, if none exit the script
+  if [[ -z `git diff HEAD --exit-code` ]] && [ -n "${PAGES_BRANCH_EXISTS}" ] ; then
+    echo "No changes to docs detected."
+    exit 0
+  fi
+  #Changes where detected, so we need to update the version log.
+  now=$(date +"%d %b %Y - %r")
+  if [ ! -f index.md ]; then
+    echo "---" >>index.md
+    echo "layout: default" >>index.md
+    echo "---" >>index.md
+    echo "<!-- Auto generated from .travis/push_docs_to_gh_pages.sh -->" >>index.md
+    echo "# Documentation versions" >>index.md
+    echo "" >>index.md
+    echo "" >>index.md #- 7th line - placeholder for latest release doc
+    echo "" >>index.md #- 8th line - placeholder for develop branch doc
+    echo "" >>index.md
+    echo "## Released Version Doc History" >>index.md
+    echo "" >>index.md
+  fi
+  #If build running on a TAG - it's a new release - need to add it to documentation
+  if [ -n "${TRAVIS_TAG}" ]; then
+    sed -i '7s@.*@'" - [Latest ${TRAVIS_TAG} documentation](latest/) - Created $now"'@' index.md
+    #add entry to the top of version history (line end of file - ## Released Version Doc History
+    sed -i '12i'" - [${TRAVIS_TAG} documentation](${UTPLSQL_VERSION}/) - Created $now" index.md
+  fi
+  #replace 4th line in log
+  sed -i '8s@.*@'" - [Latest development version](develop/) - Created $now"'@'  index.md
+  #Add and Commit the changes back to pages repo.
+  git add .
+  git commit -m "Deploy to gh-pages branch: base commit ${SHA}"
+  # Now that we're all set up, we can push.
+  git push --quiet origin HEAD:${PAGES_TARGET_BRANCH}
 fi
+