From d1246f31486cd8e9bd7025f99d3140408166beb7 Mon Sep 17 00:00:00 2001
From: Arthur Gavlyukovskiy <agavlyukovskiy@gmail.com>
Date: Sun, 26 Jul 2020 15:01:40 +0300
Subject: [PATCH] Added Oracle tests back (#504)

---
 .travis.yml               |  5 ++---
 build.gradle              |  3 +--
 docker-compose.travis.yml | 27 +++++++++++++--------------
 docker-compose.yml        | 27 +++++++++++++--------------
 4 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3e8f4dfff7..1ca62a2dcb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,9 +67,8 @@ before_script:
   # docker-compose driven DBs
   - wget -O /tmp/wtfc.sh https://raw.githubusercontent.com/typekpb/wtfc/v0.0.2/wtfc.sh && chmod +x /tmp/wtfc.sh
   - /tmp/wtfc.sh -T 0 -P 'docker inspect -f "{{.State.Health.Status}}" p6spy_firebird_1 | grep -qw healthy'
-# TODO find working image
-#  - /tmp/wtfc.sh -T 0 -P 'docker inspect -f "{{.State.Health.Status}}" p6spy_oracle_1 | grep -qw healthy'
-#  - mkdir -p ./build/repo && docker cp p6spy_oracle_1:/u01/app/oracle/product/11.2.0/xe/jdbc/lib/ojdbc6.jar ./build/repo
+  - /tmp/wtfc.sh -T 0 -P 'docker inspect -f "{{.State.Health.Status}}" p6spy_oracle_1 | grep -qw healthy'
+  - mkdir -p ./build/repo && docker cp p6spy_oracle_1:/u01/app/oracle/product/11.2.0/xe/jdbc/lib/ojdbc6.jar ./build/repo
 
 script:
   - ./gradlew check --info --stacktrace
diff --git a/build.gradle b/build.gradle
index 714c5e0106..1b8d53153e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,8 +23,7 @@ def envDB
 def isTravis = System.getProperty('env', env) != null && System.getProperty('env', env)?.equals('travis')
 if (isTravis) {
   // envDB = 'PostgreSQL,MySQL,H2,HSQLDB,SQLite,Firebird,Derby,Oracle,MSSQLServer,MariaDB,Percona'
-//  envDB = 'PostgreSQL,MySQL,H2,HSQLDB,SQLite,Firebird,Derby,Oracle'
-  envDB = 'PostgreSQL,MySQL,H2,HSQLDB,SQLite,Firebird,Derby'
+  envDB = 'PostgreSQL,MySQL,H2,HSQLDB,SQLite,Firebird,Derby,Oracle'
 } else {
   // sys property (-DDB) or env var (ORG_GRADLE_PROJECT_DB) as a fallback
   envDB = System.getProperty('DB', DB)
diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml
index b8a5f719e8..717df08351 100644
--- a/docker-compose.travis.yml
+++ b/docker-compose.travis.yml
@@ -2,20 +2,19 @@ version: "3.0"
 
 services:
 
-# TODO find working image
-#  oracle:
-#    image: wnameless/oracle-xe-11g:latest
-#    ports:
-#      - "1522:1521"
-#      - "8081:8080"
-#    volumes:
-#      - ./script/docker/oracle/create_user.sql:/docker-entrypoint-initdb.d/create_user.sql
-#      - ./script/docker/oracle/healthcheck.sh:/tmp/healthcheck.sh
-#    healthcheck:
-#      test: /bin/bash /tmp/healthcheck.sh
-#      interval: 2s
-#      timeout: 10s
-#      retries: 1800 # 2s*1800 = 3600s = 60min
+  oracle:
+    image: wnameless/oracle-xe-11g-r2:latest
+    ports:
+      - "1522:1521"
+      - "8081:8080"
+    volumes:
+      - ./script/docker/oracle/create_user.sql:/docker-entrypoint-initdb.d/create_user.sql
+      - ./script/docker/oracle/healthcheck.sh:/tmp/healthcheck.sh
+    healthcheck:
+      test: /bin/bash /tmp/healthcheck.sh
+      interval: 2s
+      timeout: 10s
+      retries: 1800 # 2s*1800 = 3600s = 60min
 
   # mssqlserver:
   #   image: microsoft/mssql-server-linux:latest
diff --git a/docker-compose.yml b/docker-compose.yml
index 4588202d2d..340e31cbd2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,20 +2,19 @@ version: "3.0"
 
 services:
 
-# TODO find working image
-#  oracle:
-#    image: wnameless/oracle-xe-11g:latest
-#    ports:
-#      - "1522:1521"
-#      - "8081:8080"
-#    volumes:
-#      - ./script/docker/oracle/create_user.sql:/docker-entrypoint-initdb.d/create_user.sql
-#      - ./script/docker/oracle/healthcheck.sh:/tmp/healthcheck.sh
-#    healthcheck:
-#      test: /bin/bash /tmp/healthcheck.sh
-#      interval: 2s
-#      timeout: 10s
-#      retries: 1800 # 2s*1800 = 3600s = 60min
+  oracle:
+    image: wnameless/oracle-xe-11g-r2:latest
+    ports:
+      - "1522:1521"
+      - "8081:8080"
+    volumes:
+      - ./script/docker/oracle/create_user.sql:/docker-entrypoint-initdb.d/create_user.sql
+      - ./script/docker/oracle/healthcheck.sh:/tmp/healthcheck.sh
+    healthcheck:
+      test: /bin/bash /tmp/healthcheck.sh
+      interval: 2s
+      timeout: 10s
+      retries: 1800 # 2s*1800 = 3600s = 60min
 
   # mssqlserver:
   #   image: microsoft/mssql-server-linux:latest