From 23e8d6c641dcb2d108583232e437f58d9cb1c6f4 Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Tue, 22 Dec 2015 16:57:08 -0800 Subject: [PATCH 1/6] When testing apache2, don't use letsencrypt-auto --- scripts/test_apache2.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/test_apache2.sh b/scripts/test_apache2.sh index a048a1ad0..6c8dec365 100755 --- a/scripts/test_apache2.sh +++ b/scripts/test_apache2.sh @@ -36,7 +36,20 @@ fi # run letsencrypt-apache2 via letsencrypt-auto cd letsencrypt -./letsencrypt-auto -v --debug --text --agree-dev-preview --agree-tos \ + +export SUDO=sudo +if [ -f /etc/debian_version ] ; then + echo "Bootstrapping dependencies for Debian-based OSes..." + $SUDO bootstrap/_deb_common.sh +elif [ -f /etc/redhat-release ] ; then + echo "Bootstrapping dependencies for RedHat-based OSes..." + $SUDO bootstrap/_rpm_common.sh +else + echo "Dont have bootstrapping for this OS!" + exit 1 +fi + +venv/bin/letsencrypt -v --debug --text --agree-dev-preview --agree-tos \ --renew-by-default --redirect --register-unsafely-without-email \ --domain $PUBLIC_HOSTNAME --server $BOULDER_URL if [ $? -ne 0 ] ; then From 237472c361a49caf951de730c85612d62a76fd1b Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Tue, 22 Dec 2015 17:09:45 -0800 Subject: [PATCH 2/6] Do things in the correct and new-fashioned way --- scripts/test_apache2.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/test_apache2.sh b/scripts/test_apache2.sh index 6c8dec365..7507bb47b 100755 --- a/scripts/test_apache2.sh +++ b/scripts/test_apache2.sh @@ -58,7 +58,7 @@ fi if [ "$OS_TYPE" = "ubuntu" ] ; then export LETSENCRYPT="$HOME/.local/share/letsencrypt/bin/letsencrypt" - tests/apache-conf-files/hackish-apache-test --debian-modules + venv/bin/tox apacheconftest else echo Not running hackish apache tests on $OS_TYPE fi @@ -69,5 +69,5 @@ fi # return error if any of the subtests failed if [ "$FAIL" = 1 ] ; then - return 1 + exit 1 fi From 91f53dc8dbf971bbc8624a5ae0677d164aeaa0b8 Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Tue, 22 Dec 2015 18:57:37 -0800 Subject: [PATCH 3/6] Fix various bugs --- multitester.py | 2 +- scripts/test_apache2.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/multitester.py b/multitester.py index fb29ab9eb..a9b766913 100644 --- a/multitester.py +++ b/multitester.py @@ -75,7 +75,7 @@ parser.add_argument('--saveinstances', action='store_true', help="don't kill EC2 instances after run, useful for debugging") parser.add_argument('--alt_pip', - default='https://certainly.isnot.org/pip/', + default='', help="server from which to pull candidate release packages") cl_args = parser.parse_args() diff --git a/scripts/test_apache2.sh b/scripts/test_apache2.sh index 7507bb47b..583f1f911 100755 --- a/scripts/test_apache2.sh +++ b/scripts/test_apache2.sh @@ -49,7 +49,8 @@ else exit 1 fi -venv/bin/letsencrypt -v --debug --text --agree-dev-preview --agree-tos \ +bootstrap/dev/venv.sh +sudo venv/bin/letsencrypt -v --debug --text --agree-dev-preview --agree-tos \ --renew-by-default --redirect --register-unsafely-without-email \ --domain $PUBLIC_HOSTNAME --server $BOULDER_URL if [ $? -ne 0 ] ; then @@ -58,7 +59,7 @@ fi if [ "$OS_TYPE" = "ubuntu" ] ; then export LETSENCRYPT="$HOME/.local/share/letsencrypt/bin/letsencrypt" - venv/bin/tox apacheconftest + venv/bin/tox -e apacheconftest else echo Not running hackish apache tests on $OS_TYPE fi From 70cc516ed817c02cc9fe4eef64d06acfd6735861 Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Wed, 23 Dec 2015 10:38:57 -0800 Subject: [PATCH 4/6] Avoid scrollback for investigating logs --- multitester.py | 1 + 1 file changed, 1 insertion(+) diff --git a/multitester.py b/multitester.py index a9b766913..5aca79b7a 100644 --- a/multitester.py +++ b/multitester.py @@ -478,6 +478,7 @@ for outq in outputs: results_file.close() if not cl_args.saveinstances: + print('Logs in ', LOGDIR) print('Terminating EC2 Instances and Cleaning Dangling EBS Volumes') boulder_server.terminate() terminate_and_clean(instances) From 263f6d64292181de38ee8e45918fb71de358977b Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Wed, 23 Dec 2015 12:26:22 -0800 Subject: [PATCH 5/6] We don't want to hardcode a letsencrypt-auto venv anymore --- scripts/test_apache2.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/test_apache2.sh b/scripts/test_apache2.sh index 583f1f911..3f646aef0 100755 --- a/scripts/test_apache2.sh +++ b/scripts/test_apache2.sh @@ -58,7 +58,6 @@ if [ $? -ne 0 ] ; then fi if [ "$OS_TYPE" = "ubuntu" ] ; then - export LETSENCRYPT="$HOME/.local/share/letsencrypt/bin/letsencrypt" venv/bin/tox -e apacheconftest else echo Not running hackish apache tests on $OS_TYPE From 8f844928b769fff68a8e2ea873c276a53831f657 Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Wed, 23 Dec 2015 14:42:26 -0800 Subject: [PATCH 6/6] Make sure we install realpath (some systems don't have it :/) --- scripts/test_apache2.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/test_apache2.sh b/scripts/test_apache2.sh index 3f646aef0..4032e2195 100755 --- a/scripts/test_apache2.sh +++ b/scripts/test_apache2.sh @@ -8,6 +8,7 @@ then CONFFILE=/etc/apache2/sites-available/000-default.conf sudo apt-get update sudo apt-get -y --no-upgrade install apache2 #curl + sudo apt-get -y install realpath # needed for test-apache-conf # For apache 2.4, set up ServerName sudo sed -i '/ServerName/ s/#ServerName/ServerName/' $CONFFILE sudo sed -i '/ServerName/ s/www.example.com/'$PUBLIC_HOSTNAME'/' $CONFFILE