Skip to content

Fix build #4 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 19, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ env:
- API_DB_USER=api
- API_DB_PASS=api
matrix:
- ORACLE_VERSION="11g-xe-r2" CONNECTION_STR="127.0.0.1:1521/XE" DOCKER_OPTIONS="--shm-size=1g"
- ORACLE_VERSION="11g-xe-r2" DOCKER_OPTIONS="--shm-size=1g"

cache:
directories:
Expand All @@ -30,7 +30,6 @@ install:
- bash .travis/maven_cfg.sh
- bash .travis/start_db.sh
- bash .travis/install_utplsql.sh
- bash .travis/create_app_user.sh

script:
- mvn test -B
8 changes: 4 additions & 4 deletions .travis/create_api_user.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash
set -ev

sqlplus -S -L / AS SYSDBA <<EOF
create user $DB_USER identified by $DB_PASS
sqlplus -S -L sys/oracle@//127.0.0.1:1521/xe AS SYSDBA <<EOF
create user api identified by api
quota unlimited on USERS
default tablespace USERS;
grant create session,
Expand All @@ -11,7 +11,7 @@ grant create session,
create table,
create sequence,
create view
to $DB_USER;
grant select any dictionary to $DB_USER;
to api;
grant select any dictionary to api;
exit;
EOF
5 changes: 3 additions & 2 deletions .travis/install_utplsql.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ git clone -b develop --single-branch https://github.com/utPLSQL/utPLSQL.git
cat > install.sh.tmp <<EOF
# tar -xzf $UTPLSQL_FILE.tar.gz && rm $UTPLSQL_FILE.tar.gz
cd /$UTPLSQL_FILE/source
sqlplus -S -L sys/oracle@//$CONNECTION_STR AS SYSDBA @install_headless.sql
sqlplus -S -L sys/oracle@//127.0.0.1:1521/xe AS SYSDBA @install_headless.sql
EOF

# Copy utPLSQL files to the container and install it.
Expand All @@ -31,4 +31,5 @@ docker cp ./create_api_user.sh $ORACLE_VERSION:/create_api_user.sh
rm install.sh.tmp

# Execute the utPLSQL installation inside the container.
docker exec $ORACLE_VERSION bash -c "/install.sh && /create_api_user.sh"
docker exec $ORACLE_VERSION bash install.sh
docker exec $ORACLE_VERSION bash create_api_user.sh