Skip to content

Commit

Permalink
Added Oracle tests back (p6spy#504)
Browse files Browse the repository at this point in the history
  • Loading branch information
gavlyukovskiy authored Jul 26, 2020
1 parent 4ac967f commit d1246f3
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 33 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
27 changes: 13 additions & 14 deletions docker-compose.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
27 changes: 13 additions & 14 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d1246f3

Please sign in to comment.