Back to all 6 DBs

jgebal · jgebal · commit d263877898b4 · 2021-11-09T21:07:46.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -50,12 +50,12 @@ env:
     - MAVEN_HOME=/usr/local/maven
     - MAVEN_CFG=$HOME/.m2
   jobs:
-    - ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}"                     CONNECTION_STR='127.0.0.1:1521/XE'     DOCKER_VOLUME="/mnt/host" DOCKER_OPTIONS='--shm-size=1g'
+    - ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}"                     CONNECTION_STR='127.0.0.1:1521/XE'      DOCKER_VOLUME="/mnt/host" DOCKER_OPTIONS='--shm-size=1g'
     - ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2-small}"              CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
-#    - ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2-small}"             CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
-#    - ORACLE_VERSION="${DOCKER_TAG_18:-18c-se2-small}"                  CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
-#    - ORACLE_VERSION="${DOCKER_TAG_19:-19c-se2-small}"                  CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
-#    - ORACLE_VERSION="${DOCKER_TAG_21XE:-21c-xe-full}"                  CONNECTION_STR='127.0.0.1:1521/XEPDB1'  DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle'
+    - ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2-small}"             CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
+    - ORACLE_VERSION="${DOCKER_TAG_18:-18c-se2-small}"                  CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
+    - ORACLE_VERSION="${DOCKER_TAG_19:-19c-se2-small}"                  CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
+    - ORACLE_VERSION="${DOCKER_TAG_21XE:-21c-xe-full}"                  CONNECTION_STR='127.0.0.1:1521/XEPDB1'  DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle'
 
 cache:
   pip: true
@@ -87,10 +87,7 @@ install:
   - mkdir -p ${OJDBC_HOME}
   - curl -Lk -o ${OJDBC_HOME}/ojdbc8.jar https://download.oracle.com/otn-pub/otn_software/jdbc/213/ojdbc8.jar
   - curl -Lk -o ${OJDBC_HOME}/orai18n.jar https://download.oracle.com/otn-pub/otn_software/jdbc/213/orai18n.jar
-  - chmod -R go+w ./source
-  - chmod -R go+w ./test
-  - chmod -R go+w ./examples
-  - chmod -R go+w ./${UTPLSQL_DIR}/source
+  - chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source}
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/start_db.sh; fi
 
 before_script:
diff --git a/.travis/start_db.sh b/.travis/start_db.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -ev
+set -e
 
 # Private Repo Login
 if [ ! -f $CACHE_DIR/.docker/config.json ]; then
@@ -10,13 +10,6 @@ else
     mkdir -p $HOME/.docker && cp $CACHE_DIR/.docker/config.json $HOME/.docker/
 fi
 
-df -h
 time docker pull $DOCKHER_HUB_REPO:$ORACLE_VERSION
-df -h
 docker run -d --name $ORACLE_VERSION --mount type=bind,source=${TRAVIS_BUILD_DIR},target=${DOCKER_VOLUME} $DOCKER_OPTIONS $DOCKER_ENV -p 1521:1521 $DOCKHER_HUB_REPO:$ORACLE_VERSION
-docker exec $ORACLE_VERSION ls -l ${DOCKER_VOLUME}
-docker exec $ORACLE_VERSION ls -l ${DOCKER_VOLUME}/${UTPLSQL_DIR}
-docker exec $ORACLE_VERSION ls -l ${DOCKER_VOLUME}/source
-docker exec $ORACLE_VERSION ls -l ${DOCKER_VOLUME}/${UTPLSQL_DIR}/source
 time docker logs -f $ORACLE_VERSION | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered
-df -h
