Merge branch 'no-staging-required' into test-no-staging-required

.travis.yml

@@ -57,9 +57,7 @@ matrix:
       before_install:
       addons:
     - python: "2.7"
-      env:
-        - BOULDER_FOR_TOX=1
-        - TOXENV=apacheconftest
+      env: TOXENV=apacheconftest-with-pebble
       sudo: required
     - python: "2.7"
       env: TOXENV=nginxroundtrip
@@ -94,10 +92,8 @@ addons:
 
 install: "travis_retry $(command -v pip || command -v pip3) install codecov tox"
 script:
-    - '[ -z "${BOULDER_FOR_TOX+x}" ] || travis_retry tests/boulder-fetch.sh'
     - travis_retry tox
-    # If BOULDER_INTEGRATION is set, run integration tests. If BOULDER_FOR_TOX isn't set, we still need to start boulder.
-    - '[ -z "${BOULDER_INTEGRATION+x}" ] || ( ( [ -n "${BOULDER_FOR_TOX+x}" ] || travis_retry tests/boulder-fetch.sh ) && tests/tox-boulder-integration.sh)'
+    - '[ -z "${BOULDER_INTEGRATION+x}" ] || (travis_retry tests/boulder-fetch.sh && tests/tox-boulder-integration.sh)'
 
 after_success: '[ "$TOXENV" == "py27-cover" ] && codecov'
 

certbot-apache/certbot_apache/tests/apache-conf-files/apache-conf-test

@@ -3,9 +3,7 @@
 # A hackish script to see if the client is behaving as expected 
 # with each of the "passing" conf files.
 
-SERVER="${SERVER:-http://localhost:4000/directory}"
-if ! curl "$SERVER" >/dev/null 2>&1; then
-    echo "ACME server not found."
+if [ -z "$SERVER" ]; then
     echo "Please set SERVER to the ACME server's directory URL."
     exit 1
 fi

tox.ini

@@ -158,6 +158,13 @@ commands =
 passenv =
     SERVER
 
+[testenv:apacheconftest-with-pebble]
+commands =
+    {toxinidir}/tests/pebble-fetch.sh
+    {[testenv:apacheconftest]commands}
+setenv =
+    SERVER=https://localhost:14000/dir
+
 [testenv:nginxroundtrip]
 commands =
     {[base]pip_install} acme . certbot-apache certbot-nginx