diff --git a/.travis.yml b/.travis.yml index 7cccd20c..52ad4950 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: python +services: + - rabbitmq + # http://docs.travis-ci.com/user/ci-environment/#CI-environment-OS before_install: - travis_retry sudo ./bootstrap/ubuntu.sh @@ -20,7 +23,7 @@ env: - TOXENV=cover install: "travis_retry pip install tox coveralls" -before_script: '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/boulder-start.sh' +before_script: '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/boulder-start.sh amqp' script: 'travis_retry tox && ([ "xxx$BOULDER_INTEGRATION" = "xxx" ] || (source .tox/$TOXENV/bin/activate && ./tests/boulder-integration.sh))' after_success: '[ "$TOXENV" == "cover" ] && coveralls' diff --git a/tests/boulder-start.sh b/tests/boulder-start.sh index 49139ff3..20f64bcc 100755 --- a/tests/boulder-start.sh +++ b/tests/boulder-start.sh @@ -11,5 +11,10 @@ export GOPATH="${GOPATH:-/tmp/go}" go get -d github.com/letsencrypt/boulder/cmd/boulder cd $GOPATH/src/github.com/letsencrypt/boulder make -j4 # Travis has 2 cores per build instance. -./start.sh & -# Hopefully start.sh bootstraps before integration test is started... +if [ "$1" = "amqp" ]; +then + ./start.py & +else + ./start.sh & +fi +# Hopefully start.py/start.sh bootstraps before integration test is started...