For now, disable apacheconftest in travis :(

This commit is contained in:
Peter Eckersley
2015-12-26 20:16:41 -08:00
parent ce9e3c1f94
commit f20cd73e8d
+11 -8
View File
@@ -3,7 +3,8 @@ language: python
services: services:
- rabbitmq - rabbitmq
- mariadb - mariadb
- apache2 # apacheconftest
#- apache2
# http://docs.travis-ci.com/user/ci-environment/#CI-environment-OS # http://docs.travis-ci.com/user/ci-environment/#CI-environment-OS
# gimme has to be kept in sync with Boulder's Go version setting in .travis.yml # gimme has to be kept in sync with Boulder's Go version setting in .travis.yml
@@ -23,7 +24,9 @@ env:
- TOXENV=py27 BOULDER_INTEGRATION=1 - TOXENV=py27 BOULDER_INTEGRATION=1
- TOXENV=lint - TOXENV=lint
- TOXENV=cover - TOXENV=cover
- TOXENV=apacheconftest # Disabled for now due to requiring sudo -> causing more boulder integration
# DNS timeouts :(
# - TOXENV=apacheconftest
# Only build pushes to the master branch, PRs, and branches beginning with # Only build pushes to the master branch, PRs, and branches beginning with
@@ -35,7 +38,7 @@ branches:
- /^test-.*$/ - /^test-.*$/
# container-based infrastructure # container-based infrastructure
sudo: true sudo: false
addons: addons:
# make sure simplehttp simple verification works (custom /etc/hosts) # make sure simplehttp simple verification works (custom /etc/hosts)
@@ -61,11 +64,11 @@ addons:
# For Boulder integration testing # For Boulder integration testing
- rsyslog - rsyslog
# for apacheconftest # for apacheconftest
- realpath #- realpath
- apache2 #- apache2
- libapache2-mod-wsgi #- libapache2-mod-wsgi
- libapache2-mod-macro #- libapache2-mod-macro
- sudo #- sudo
install: "travis_retry pip install tox coveralls" install: "travis_retry pip install tox coveralls"
script: 'travis_retry tox && ([ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/travis-integration.sh)' script: 'travis_retry tox && ([ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/travis-integration.sh)'