From 47b3c3f04e7a4e284cf01dcfe7b0854b5c0bcd3a Mon Sep 17 00:00:00 2001 From: John Tims Date: Fri, 15 Nov 2019 14:52:32 -0700 Subject: [PATCH] Remove cubrid in tests --- .travis.yml | 5 +++-- pom.xml | 3 ++- travis/docker_bootstrap.sh | 7 ------- 3 files changed, 5 insertions(+), 10 deletions(-) delete mode 100755 travis/docker_bootstrap.sh diff --git a/.travis.yml b/.travis.yml index 149e1a3dd..3b3d2b0fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,10 @@ before_script: - mkdir -p ~/.local/bin - curl 'https://bitbucket.org/mjensen/mvnvm/raw/master/mvn' > ~/.local/bin/mvn - chmod +x ~/.local/bin/mvn + - docker-compose --file travis/docker-compose.yml up -d mysql postgresql firebird mongo - - ./travis/docker_bootstrap.sh -script: mvn --batch-mode test --activate-profiles ${PROFILES} --projects ${MODULE} -am jacoco:report +script: + - mvn --batch-mode test --activate-profiles ${PROFILES} --projects ${MODULE} -am jacoco:report after_success: - mvn coveralls:report cache: diff --git a/pom.xml b/pom.xml index 56b4838c0..9ff0c4bb9 100644 --- a/pom.xml +++ b/pom.xml @@ -694,7 +694,8 @@ com.querydsl.core.testutil.DB2, com.querydsl.core.testutil.SQLServer, com.querydsl.core.testutil.Teradata, - com.querydsl.core.testutil.Oracle + com.querydsl.core.testutil.Oracle, + com.querydsl.core.testutil.CUBRID diff --git a/travis/docker_bootstrap.sh b/travis/docker_bootstrap.sh deleted file mode 100755 index 95ed039ff..000000000 --- a/travis/docker_bootstrap.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -ex - -docker-compose --file travis/docker-compose.yml up -d mysql postgresql firebird cubrid mongo -docker exec $(docker-compose --file travis/docker-compose.yml ps -q cubrid) /bin/bash -c 'mkdir -p ~/CUBRID_databases/demodb && cd $_ && cubrid createdb --db-volume-size=100M --log-volume-size=100M demodb en_US.iso88591 && cubrid loaddb -u dba -s $CUBRID/demo/demodb_schema -d $CUBRID/demo/demodb_objects demodb' -docker exec -d $(docker-compose --file travis/docker-compose.yml ps -q cubrid) /bin/bash -c 'cubrid server start demodb' -docker ps