diff --git a/.travis.yml b/.travis.yml index 5ccf39811..8477bb163 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,20 @@ env: matrix: include: + - python: "2.7" + env: TOXENV=cover BOULDER_INTEGRATION=1 + sudo: true + after_failure: + - sudo cat /var/log/mysql/error.log + - ps aux | grep mysql + - python: "2.7" + env: TOXENV=lint + - python: "2.7" + env: TOXENV=py27-oldest BOULDER_INTEGRATION=1 + sudo: true + after_failure: + - sudo cat /var/log/mysql/error.log + - ps aux | grep mysql - python: "2.6" env: TOXENV=py26 BOULDER_INTEGRATION=1 sudo: true @@ -31,25 +45,11 @@ matrix: after_failure: - sudo cat /var/log/mysql/error.log - ps aux | grep mysql - - python: "2.7" - env: TOXENV=apacheconftest - sudo: required - - python: "2.7" - env: TOXENV=nginxroundtrip - - python: "2.7" - env: TOXENV=py27 BOULDER_INTEGRATION=1 - sudo: true - after_failure: - - sudo cat /var/log/mysql/error.log - - ps aux | grep mysql - - python: "2.7" - env: TOXENV=py27-oldest BOULDER_INTEGRATION=1 - sudo: true - after_failure: - - sudo cat /var/log/mysql/error.log - - ps aux | grep mysql - - python: "2.7" - env: TOXENV=lint + - sudo: required + env: TOXENV=nginx_compat + services: docker + before_install: + addons: - sudo: required env: TOXENV=le_auto services: docker @@ -60,19 +60,18 @@ matrix: services: docker before_install: addons: - - sudo: required - env: TOXENV=nginx_compat - services: docker - before_install: - addons: - - python: "2.7" - env: TOXENV=cover - python: "3.3" env: TOXENV=py33 - python: "3.4" env: TOXENV=py34 - python: "3.5" env: TOXENV=py35 + - python: "2.7" + env: TOXENV=apacheconftest + sudo: required + - python: "2.7" + env: TOXENV=nginxroundtrip + # Only build pushes to the master branch, PRs, and branches beginning with # `test-`. This reduces the number of simultaneous Travis runs, which speeds