From f8614e7c04a935de883b3004b9aa97eb4614517a Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Fri, 17 May 2019 02:03:00 -0700 Subject: [PATCH] Fix centos6 test_sdists (#7068) * Use Python 3 when appropriate. * fix venv path --- tests/letstest/scripts/test_sdists.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/letstest/scripts/test_sdists.sh b/tests/letstest/scripts/test_sdists.sh index a9177f690..f407d5d2c 100755 --- a/tests/letstest/scripts/test_sdists.sh +++ b/tests/letstest/scripts/test_sdists.sh @@ -1,15 +1,24 @@ #!/bin/sh -xe cd letsencrypt -./certbot-auto --os-packages-only -n --debug +./certbot-auto --install-only -n --debug PLUGINS="certbot-apache certbot-nginx" +PYTHON_MAJOR_VERSION=$(/opt/eff.org/certbot/venv/bin/python --version 2>&1 | cut -d" " -f 2 | cut -d. -f1) TEMP_DIR=$(mktemp -d) VERSION=$(letsencrypt-auto-source/version.py) +if [ "$PYTHON_MAJOR_VERSION" = "3" ]; then + VENV_PATH="venv3" + VENV_SCRIPT="tools/venv3.py" +else + VENV_SCRIPT="tools/venv.py" + VENV_PATH="venv" +fi + # setup venv -tools/venv.py --requirement letsencrypt-auto-source/pieces/dependency-requirements.txt -. ./venv/bin/activate +"$VENV_SCRIPT" --requirement letsencrypt-auto-source/pieces/dependency-requirements.txt +. "$VENV_PATH/bin/activate" # pytest is needed to run tests on some of our packages so we install a pinned version here. tools/pip_install.py pytest