Merge pull request #7 from utPLSQL/feature/fix_build_and_badges

Feature/fix build and badges

Author: jgebal

.travis.yml

@@ -16,13 +16,16 @@ addons:
 
 env:
   global:
-    #Oracle 11g XE R2 variables
-    - ORACLE_COOKIE=sqldev
-    - ORACLE_FILE=oracle11g/xe/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
-    - ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe
-    - ORACLE_SID=XE
-    #Adding SQLPlus to path
-    - PATH=$PATH:$ORACLE_HOME/bin
+    #Oracle 11g XE R2 docker variables
+    - ORACLE_VERSION=11g-r2-xe
+    - CONNECTION_STR='127.0.0.1:1521/XE'
+    - DOCKER_OPTIONS='--shm-size=1g'
+    # Docker database Env
+    - SQLCLI="$HOME/sqlcl/bin/sql"
+    - OJDBC_HOME="$HOME/sqlcl/lib"
+    - ORACLE_PWD="oracle"
+    - UT3_DOCKER_REPO="utplsqlv3/oracledb"
+    - DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}"
     # project variables
     - DB_USER=ut3_demo
     - DB_PASS=LHZYPbWvYdu2ctp8
@@ -49,9 +52,6 @@ cache:
     - $MAVEN_CFG
 
 before_install:
-  - npm install -g phantomjs-prebuilt casperjs
-  # download Oracle XE installer for Travis
-  - .travis/oracle/download.sh
   # download latest utPLSQL develop code
   - git clone --depth=1 --branch=${UTPLSQL_3_VERSION} https://github.com/utPLSQL/utPLSQL.git ${UTPLSQL_DIR}
   # download latest utPLSQL-cli release
@@ -64,12 +64,14 @@ install:
   - unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli
   # get ojdbc.jar from Oracle using maven
   - bash .travis/maven_cfg.sh
-  # Install Oracle Database
-  - .travis/oracle/install.sh
+  - bash .travis/install_sqlcl.sh
+  # download and run Oracle docker DB image
+  - bash .travis/start_db.sh
+
   # Install utPLSQL
   - .travis/install_utplsql.sh
   - .travis/setup_account.sh
-  # Instal project sources and tests
+  # Install project sources and tests
   - source/install.sh
   - test/install.sh
 

.travis/download.js

@@ -1,3 +1,4 @@
+
 var casper = require("casper").create({
    // verbose: true,
    // logLevel: "debug",
@@ -16,6 +17,7 @@ var paramUsername = casper.cli.get(0);
 var paramPassword = casper.cli.get(1);
 var agreementUrl  = casper.cli.get(2);
 var downloadUrl   = casper.cli.get(3);
+var downloaded    = false;
 
 casper.start();
 // TODO: Error handling.
@@ -40,10 +42,11 @@ casper.thenOpen(downloadUrl).waitForUrl(/signon\.jsp$/, function (re) {
 });
 
 casper.on("resource.received", function (resource) {
-   if (resource.url.indexOf("AuthParam") !== -1) {
+   if (resource.url.indexOf("AuthParam") !== -1 && !downloaded) {
       // this.echo("DownloadUrl:");
       // Print the download url.
       this.echo(resource.url);
+      downloaded = true;
       // TODO: Try to download file from here. this.download is not working because of cross site request.
    }
 });

.travis/download.sh

@@ -11,10 +11,10 @@ PRODUCT=""
 # Call the casperjs script to return the download url.
 # Then download the file using curl.
 downloadFile() {
-    CURRENT_DIR="$(dirname "$(readlink -f "$0")")"
-    downloadUrl=$(exec casperjs ${CURRENT_DIR}/download.js $ORACLE_OTN_USER $ORACLE_OTN_PASSWORD $1 $2)
+    downloadUrl=$(exec casperjs download.js $ORACLE_OTN_USER $ORACLE_OTN_PASSWORD $1 $2)
+    downloadUrl=${downloadUrl%$'\r'}
     echo "DownloadURL: $downloadUrl"
-    curl $downloadUrl -o ${CURRENT_DIR}/oracle/$3
+    curl -o $3 -L "$downloadUrl"
 }
 
 #############################
@@ -61,8 +61,8 @@ fi
 
 if [ "$PRODUCT" == "sqlcl" ]; then
     agreementUrl="http://www.oracle.com/technetwork/developer-tools/sqlcl/downloads/index.html"
-    downloadUrl="http://download.oracle.com/otn/java/sqldeveloper/sqlcl-4.2.0.17.073.1038-no-jre.zip"
-    outputFile=sqlcl-4.2.0.17.073.1038-no-jre.zip
+    downloadUrl="https://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.3.0.259.2029.zip"
+    outputFile=sqlcl-18.3.0.259.2029.zip
     downloadFile $agreementUrl $downloadUrl $outputFile
     exit 0
 fi

.travis/install_sqlcl.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+
+SQLCL_FILE=sqlcl-18.3.0.259.2029.zip
+cd .travis
+
+# Download if not present on cache dir.
+if [ ! -f $CACHE_DIR/$SQLCL_FILE ]; then
+    npm install -g phantomjs-prebuilt casperjs
+    bash download.sh -p sqlcl
+    mv $SQLCL_FILE $CACHE_DIR
+else
+    echo "Installing sqlcl from cache..."
+fi;
+
+# Install sqlcl.
+unzip -q $CACHE_DIR/$SQLCL_FILE -d $HOME
+
+# Check if it is installed correctly.
+$SQLCLI -v

.travis/install_utplsql.sh

@@ -4,9 +4,9 @@ set -ev
 
 cd $UTPLSQL_DIR/source
 
-sqlplus -S -L / AS SYSDBA @install_headless.sql
+${SQLCLI} -S -L sys/${ORACLE_PWD}@//${CONNECTION_STR} AS SYSDBA @install_headless.sql
 
-sqlplus -L -S / AS SYSDBA <<SQL
-grant select any dictionary to ut3;
-exit
-SQL
+#${SQLCLI} -L -S sys/${ORACLE_PWD}@//${CONNECTION_STR} AS SYSDBA <<SQL
+#grant select any dictionary to ut3;
+#exit
+#SQL