Merge pull request #2506 from TheNavigat/acttravis

Enabling apache-conf-test in Travis
This commit is contained in:
Peter Eckersley
2016-02-23 15:53:58 -08:00
+3 -4
View File
@@ -30,10 +30,9 @@ matrix:
env: TOXENV=py26 BOULDER_INTEGRATION=1 env: TOXENV=py26 BOULDER_INTEGRATION=1
- python: "2.6" - python: "2.6"
env: TOXENV=py26-oldest BOULDER_INTEGRATION=1 env: TOXENV=py26-oldest BOULDER_INTEGRATION=1
# Disabled for now due to requiring sudo -> causing more boulder integration - python: "2.7"
# DNS timeouts :( env: TOXENV=apacheconftest
# - python: "2.7" sudo: required
# env: TOXENV=apacheconftest
- python: "2.7" - python: "2.7"
env: TOXENV=py27 BOULDER_INTEGRATION=1 env: TOXENV=py27 BOULDER_INTEGRATION=1
- python: "2.7" - python: "2.7"