mirror of
https://github.com/certbot/certbot.git
synced 2026-08-02 00:22:28 +02:00
Dump Boulder logs on integration test failures. (#4442)
Might help debug #4363. Also: make "bash" vs "sh" explicit move the paranoia flags (-ex) from the shebang into the body add -u (fail on unset variables) change _common to work with -u remove some env vars that were no longer used remove shebang from _common.sh because it's meant to be sourced, not run
This commit is contained in:
committed by
GitHub
parent
6fb78dab67
commit
d5f1edf2bb
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/sh -xe
|
#!/bin/bash
|
||||||
# Simple integration test. Make sure to activate virtualenv beforehand
|
# Simple integration test. Make sure to activate virtualenv beforehand
|
||||||
# (source venv/bin/activate) and that you are running Boulder test
|
# (source venv/bin/activate) and that you are running Boulder test
|
||||||
# instance (see ./boulder-fetch.sh).
|
# instance (see ./boulder-fetch.sh).
|
||||||
@@ -8,12 +8,11 @@
|
|||||||
#
|
#
|
||||||
# Note: this script is called by Boulder integration test suite!
|
# Note: this script is called by Boulder integration test suite!
|
||||||
|
|
||||||
|
set -eux
|
||||||
|
|
||||||
. ./tests/integration/_common.sh
|
. ./tests/integration/_common.sh
|
||||||
export PATH="$PATH:/usr/sbin" # /usr/sbin/nginx
|
export PATH="$PATH:/usr/sbin" # /usr/sbin/nginx
|
||||||
|
|
||||||
export GOPATH="${GOPATH:-/tmp/go}"
|
|
||||||
export PATH="$GOPATH/bin:$PATH"
|
|
||||||
|
|
||||||
if [ `uname` = "Darwin" ];then
|
if [ `uname` = "Darwin" ];then
|
||||||
readlink="greadlink"
|
readlink="greadlink"
|
||||||
else
|
else
|
||||||
@@ -27,6 +26,14 @@ cleanup_and_exit() {
|
|||||||
echo Kill server subprocess, left running by abnormal exit
|
echo Kill server subprocess, left running by abnormal exit
|
||||||
kill $SERVER_STILL_RUNNING
|
kill $SERVER_STILL_RUNNING
|
||||||
fi
|
fi
|
||||||
|
# Dump boulder logs in case they contain useful debugging information.
|
||||||
|
: "------------------ ------------------ ------------------"
|
||||||
|
: "------------------ begin boulder logs ------------------"
|
||||||
|
: "------------------ ------------------ ------------------"
|
||||||
|
docker logs boulder_boulder_1
|
||||||
|
: "------------------ ------------------ ------------------"
|
||||||
|
: "------------------ end boulder logs ------------------"
|
||||||
|
: "------------------ ------------------ ------------------"
|
||||||
exit $EXIT_STATUS
|
exit $EXIT_STATUS
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,7 @@
|
|||||||
#!/bin/sh
|
# The -t is required on macOS. It provides a template file path for
|
||||||
|
# the kernel to use.
|
||||||
if [ "xxx$root" = "xxx" ];
|
root=${root:-$(mktemp -d -t leitXXXX)}
|
||||||
then
|
echo "Root integration tests directory: $root"
|
||||||
# The -t is required on macOS. It provides a template file path for
|
|
||||||
# the kernel to use.
|
|
||||||
root="$(mktemp -d -t leitXXXX)"
|
|
||||||
echo "Root integration tests directory: $root"
|
|
||||||
fi
|
|
||||||
store_flags="--config-dir $root/conf --work-dir $root/work"
|
store_flags="--config-dir $root/conf --work-dir $root/work"
|
||||||
store_flags="$store_flags --logs-dir $root/logs"
|
store_flags="$store_flags --logs-dir $root/logs"
|
||||||
tls_sni_01_port=5001
|
tls_sni_01_port=5001
|
||||||
|
|||||||
Reference in New Issue
Block a user