Merge remote-tracking branch 'upstream/develop' into feature/update_release_process

jgebal · jgebal · commit f8b09c5a72b4 · 2017-03-28T19:48:32.000+01:00
# Conflicts:
#	.travis.yml
diff --git a/.travis.yml b/.travis.yml
@@ -44,7 +44,7 @@ env:
   matrix:
     - ORACLE_VERSION="12c-se-r1" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1'
     - ORACLE_VERSION="11g-xe-r2" CONNECTION_STR='127.0.0.1:1521/XE'        DOCKER_OPTIONS='--shm-size=1g'
-    - ORACLE_VERSION="12c-se2-r2" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1'
+    - ORACLE_VERSION="12c-se2-r2-v2" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
 
 cache:
   pip: true
@@ -55,6 +55,8 @@ cache:
 install:
   - pip install mkdocs
   - bash .travis/install_sqlcl.sh
+  - sudo mkdir -p /dev/pdbs
+  - sudo chmod -R 777 /dev/pdbs
   - if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/start_db.sh; fi
 
 before_script:
diff --git a/.travis/start_db.sh b/.travis/start_db.sh
@@ -14,16 +14,4 @@ fi
 
 docker pull $DOCKER_BASE_TAG:$ORACLE_VERSION
 docker run -d --name $ORACLE_VERSION $DOCKER_OPTIONS -p 1521:1521 $DOCKER_BASE_TAG:$ORACLE_VERSION
-docker logs -f $ORACLE_VERSION | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered
-
-if [ "$ORACLE_VERSION" == "12c-se2-r2" ]; then
-    "$SQLCLI" sys/oracle@//127.0.0.1:1521/ORCLCDB as sysdba <<EOF
-CREATE PLUGGABLE DATABASE ORCLPDB1 ADMIN USER PDBADMIN IDENTIFIED BY "$ORACLE_PWD"
-  FILE_NAME_CONVERT=('/opt/oracle/oradata/ORCLCDB/pdbseed/','/opt/oracle/oradata/ORCLPDB1/');
-ALTER PLUGGABLE DATABASE ORCLPDB1 SAVE STATE;  
-ALTER PLUGGABLE DATABASE ORCLPDB1 OPEN READ WRITE;
-ALTER SESSION SET CONTAINER = ORCLPDB1;
-CREATE TABLESPACE users DATAFILE '/opt/oracle/oradata/ORCLPDB1/users01.dbf' SIZE 1M AUTOEXTEND ON NEXT 1M;
-exit;
-EOF
-fi
+docker logs -f $ORACLE_VERSION | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered
