From b1027a2f2544b89d997df679997fe202a5420899 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Sat, 10 Feb 2018 00:18:33 +1300 Subject: [PATCH] Testing - modify .travis to run mysql as docker container --- .travis.yml | 2 +- src/test/resources/docker-run.properties | 8 ++++++-- src/test/resources/ebean.properties | 8 +++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index cfd2f10ad..1e2f4a947 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_script: env: - EBEAN_DB=h2 - EBEAN_DB=pg -# - EBEAN_DB=mysql + - EBEAN_DB=mysql install: true diff --git a/src/test/resources/docker-run.properties b/src/test/resources/docker-run.properties index c5f5af698..52369203c 100644 --- a/src/test/resources/docker-run.properties +++ b/src/test/resources/docker-run.properties @@ -1,4 +1,10 @@ +mysql.version=5.7 +mysql.dbName=test_ebean +mysql.dbUser=test_ebean +mysql.dbPassword=test +mysql.startMode=dropcreate + #sqlserver.version=2017-CU2 #sqlserver.port=1433 #sqlserver.dbName=test_ebean @@ -11,8 +17,6 @@ #oracle.dbPassword=test ##oracle.startMode=dropcreate -#mysql.version=5.7 -#mysql.startMode=dropcreate #postgres.version=9.6 ##postgres.dbName=test_db diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties index 9e9a42ac8..62b6ee97e 100644 --- a/src/test/resources/ebean.properties +++ b/src/test/resources/ebean.properties @@ -103,11 +103,9 @@ datasource.hsqldb.databaseUrl=jdbc:hsqldb:mem:tests datasource.hsqldb.databaseDriver=org.hsqldb.jdbcDriver -datasource.mysql.username=unit -datasource.mysql.password=unit -datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:3306/unit -#connection String for Connector/j 6.0 -#datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:3306/unit?useLegacyDatetimeCode=false&serverTimezone=UTC +datasource.mysql.username=test_ebean +datasource.mysql.password=test +datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:4306/test_ebean datasource.mysql.databaseDriver=com.mysql.jdbc.Driver