Change db env names

viniciusam · viniciusam · commit c5fc6260cb03 · 2017-07-21T22:01:04.000-03:00
diff --git a/.travis.yml b/.travis.yml
@@ -15,9 +15,9 @@ env:
     - CACHE_DIR=$HOME/.cache
     - MAVEN_HOME=/usr/local/maven
     - MAVEN_CFG=$HOME/.m2
-    - API_DB_URL="127.0.0.1:1521:XE"
-    - API_DB_USER=api
-    - API_DB_PASS=api
+    - DB_URL="127.0.0.1:1521:XE"
+    - DB_USER=app
+    - DB_PASS=app
   matrix:
     - ORACLE_VERSION="11g-xe-r2" DOCKER_OPTIONS="--shm-size=1g"
 
diff --git a/.travis/install_utplsql.sh b/.travis/install_utplsql.sh
@@ -28,6 +28,7 @@ docker cp ./create_api_user.sh $ORACLE_VERSION:/create_api_user.sh
 
 # Remove temporary files.
 # rm $UTPLSQL_FILE.tar.gz
+rm -rf $UTPLSQL_FILE
 rm install.sh.tmp
 
 # Execute the utPLSQL installation inside the container.
diff --git a/src/test/java/io/github/utplsql/api/rules/DatabaseRule.java b/src/test/java/io/github/utplsql/api/rules/DatabaseRule.java
@@ -18,9 +18,9 @@ public class DatabaseRule extends ExternalResource {
     private static String sPass;
 
     static {
-        sUrl  = System.getenv("API_DB_URL")  != null ? System.getenv("API_DB_URL")  : "127.0.0.1:1521:XE";
-        sUser = System.getenv("API_DB_USER") != null ? System.getenv("API_DB_USER") : "app";
-        sPass = System.getenv("API_DB_PASS") != null ? System.getenv("API_DB_PASS") : "app";
+        sUrl  = System.getenv("DB_URL")  != null ? System.getenv("DB_URL")  : "192.168.99.100:1521:XE";
+        sUser = System.getenv("DB_USER") != null ? System.getenv("DB_USER") : "app";
+        sPass = System.getenv("DB_PASS") != null ? System.getenv("DB_PASS") : "app";
     }
 
     private List<Connection> connectionList;
