diff --git a/.travis.yml b/.travis.yml index f1800081..6f2dc4ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,7 @@ install: - ./mvnw --settings .settings.xml install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true - ./docs/src/main/asciidoc/ghpages.sh script: -#- ./src/test/bash/travis_run_consul.sh -- ./consul agent -server -advertise 127.0.0.1 -bootstrap-expect 1 -data-dir /tmp/consul -ui-dir ./src/test/resources/consul_ui & +- ./src/test/bash/travis_run_consul.sh - '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || ./mvnw --settings .settings.xml deploy -nsu -Dmaven.test.redirectTestOutputToFile=true' - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] || ./mvnw --settings .settings.xml install -nsu -Dmaven.test.redirectTestOutputToFile=true' env: diff --git a/src/test/bash/travis_run_consul.sh b/src/test/bash/travis_run_consul.sh index cf0337ad..565ffa29 100755 --- a/src/test/bash/travis_run_consul.sh +++ b/src/test/bash/travis_run_consul.sh @@ -1,6 +1,6 @@ #!/bin/bash BASEDIR=`dirname $0`/../../.. -${BASEDIR}/consul agent -server -bootstrap-expect 1 -advertise 127.0.0.1 -data-dir /tmp/consul -ui-dir ${BASEDIR}/src/test/resources/consul_ui #-config-dir ${BASEDIR}/src/test/resources/consul_config & +${BASEDIR}/consul agent -server -bootstrap-expect 1 -advertise 127.0.0.1 -data-dir /tmp/consul -ui-dir ${BASEDIR}/src/test/resources/consul_ui & #-config-dir ${BASEDIR}/src/test/resources/consul_config & # wait for consul to elect a leader before sending acl #sleep 5 #curl -X PUT -d @`dirname $0`/../../test/resources/consul_acl/consul_discovery_client_acl.json http://localhost:8500/v1/acl/create?token=2ee647bd-bd69-4118-9f34-b9a6e9e60746