Skip to content

Commit

Permalink
Sync up ui2 database loading with ws
Browse files Browse the repository at this point in the history
  • Loading branch information
denis-yuen committed May 8, 2018
1 parent 17e5fee commit f9d8331
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ before_script:
- pwd
- wget --no-verbose http://central.maven.org/maven2/io/swagger/swagger-codegen-cli/2.3.1/swagger-codegen-cli-2.3.1.jar -O swagger-codegen-cli.jar
- java -jar swagger-codegen-cli.jar generate -i https://raw.githubusercontent.com/ga4gh/dockstore/${WEBSERVICE_VERSION}/dockstore-webservice/src/main/resources/swagger.yaml -l typescript-angular -o src/app/shared/swagger -c swagger-config.json
- psql 'postgres' -U postgres < travisci/db_dump.sql
- psql -c "create user dockstore with password 'dockstore' createdb;" -U postgres
- psql -c "ALTER USER dockstore WITH superuser;" -U postgres
- psql -c 'create database webservice_test with owner = dockstore;' -U postgres
- psql -f travisci/db_dump.sql webservice_test
- java -jar dockstore-webservice-${WEBSERVICE_VERSION}.jar server travisci/web.yml 1>/dev/null &
- 'sleep 20'

Expand Down
6 changes: 3 additions & 3 deletions travisci/web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ database:
driverClass: org.postgresql.Driver

# the username
user: postgres
user: dockstore

# the password
password: postgres
password: dockstore

# the JDBC URL
url: jdbc:postgresql://localhost:5432/postgres
url: jdbc:postgresql://localhost:5432/webservice_test

# any properties specific to your JDBC driver:
properties:
Expand Down

0 comments on commit f9d8331

Please sign in to comment.