Back out some noise.

docs/contributing.rst

@@ -127,7 +127,6 @@ Boulder:
 
 .. code-block:: shell
 
-   export SERVER=http://localhost:4000/directory
    source tests/integration/_common.sh
 
 Run the integration tests using:

tests/boulder-fetch.sh

@@ -24,9 +24,18 @@ if [ "$BOULDER_INTEGRATION" = "v2" ]; then
 fi
 
 docker-compose up -d
+printf "\n10.77.77.77 boulder" | sudo tee -a /etc/hosts
 
 set +x  # reduce verbosity while waiting for boulder
-until curl http://localhost:4000/directory 2>/dev/null; do
+for n in `seq 1 300` ; do
-  echo waiting for boulder
+  if curl http://boulder:4000/directory 2>/dev/null ; then
-  sleep 1
+    break
+  else
+    echo waiting for boulder
+    sleep 1
+  fi
+  if [[ $n == 300 ]]; then
+    echo timed out waiting for boulder
+    exit 1
+  fi
 done

tests/integration/_common.sh

@@ -16,9 +16,10 @@ certbot_test () {
         "$@"
 }
 
+export SERVER=${SERVER:-http://boulder:4000/directory}
 # Use local ACMEv2 endpoint if requested and SERVER isn't already set.
 if [ "${BOULDER_INTEGRATION:-v1}" = "v2" -a -z "${SERVER:+x}" ]; then
-    SERVER="http://localhost:4001/directory"
+    SERVER="http://boulder:4001/directory"
 fi
 
 certbot_test_no_force_renew () {
@@ -30,7 +31,7 @@ certbot_test_no_force_renew () {
         --source $sources \
         --omit $omit_patterns \
         $(command -v certbot) \
-            --server "${SERVER:-http://localhost:4000/directory}" \
+            --server "${SERVER}" \
             --no-verify-ssl \
             --tls-sni-01-port $tls_sni_01_port \
             --http-01-port $http_01_port \

tests/manual-dns-auth.sh

@@ -2,7 +2,7 @@
 
 # If domain begins with fail, fail the challenge by not completing it.
 if [[ "$CERTBOT_DOMAIN" != fail* ]]; then
-    curl -X POST 'http://localhost:8055/set-txt' -d \
+    curl -X POST "http://boulder:8055/set-txt" -d \
         "{\"host\": \"_acme-challenge.$CERTBOT_DOMAIN.\", \
          \"value\": \"$CERTBOT_VALIDATION\"}"
 fi

tests/manual-dns-cleanup.sh

@@ -3,6 +3,6 @@
 # If domain begins with fail, we didn't complete the challenge so there is
 # nothing to clean up.
 if [[ "$CERTBOT_DOMAIN" != fail* ]]; then
-    curl -X POST 'http://localhost:8055/clear-txt' -d \
+    curl -X POST "http://boulder:8055/clear-txt" -d \
         "{\"host\": \"_acme-challenge.$CERTBOT_DOMAIN.\"}"
 fi