From 171fde5f51bd2f8d41e2cce7311cfea92b8e7064 Mon Sep 17 00:00:00 2001
From: Erica Portnoy <ebportnoy@gmail.com>
Date: Wed, 12 Aug 2020 17:56:21 -0700
Subject: [PATCH] Update test_sdists to use new script

---
 .../letstest/scripts/bootstrap_os_packages.sh |  4 +-
 tests/letstest/scripts/test_apache2.sh        |  2 +-
 tests/letstest/scripts/test_sdists.sh         | 39 ++++---------------
 3 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/tests/letstest/scripts/bootstrap_os_packages.sh b/tests/letstest/scripts/bootstrap_os_packages.sh
index d30027e40..20691a670 100755
--- a/tests/letstest/scripts/bootstrap_os_packages.sh
+++ b/tests/letstest/scripts/bootstrap_os_packages.sh
@@ -193,5 +193,5 @@ fi
 
 Bootstrap
 
-cd $1
-$2
+cd $1 # REPO_ROOT
+$2 # Call the venv setup script here so we don't have to activate Python36SCL in the parent
diff --git a/tests/letstest/scripts/test_apache2.sh b/tests/letstest/scripts/test_apache2.sh
index 82c7fe1f2..c14d7d1b2 100755
--- a/tests/letstest/scripts/test_apache2.sh
+++ b/tests/letstest/scripts/test_apache2.sh
@@ -70,7 +70,7 @@ fi
 
 if [ "$OS_TYPE" = "ubuntu" ] ; then
     export SERVER="$BOULDER_URL"
-    "$venv3/bin/tox" -e apacheconftest
+    "venv3/bin/tox" -e apacheconftest
 else
     echo Not running hackish apache tests on $OS_TYPE
 fi
diff --git a/tests/letstest/scripts/test_sdists.sh b/tests/letstest/scripts/test_sdists.sh
index 338569e6d..53a783bb6 100755
--- a/tests/letstest/scripts/test_sdists.sh
+++ b/tests/letstest/scripts/test_sdists.sh
@@ -2,43 +2,18 @@
 
 cd letsencrypt
 
-# If we're on a RHEL 6 based system, we can be confident Python is already
-# installed because the package manager is written in Python.
-if command -v python && [ $(python -V 2>&1 | cut -d" " -f 2 | cut -d. -f1,2 | sed 's/\.//') -eq 26 ]; then
-    # RHEL/CentOS 6 will need a special treatment, so we need to detect that environment
-    RUN_RHEL6_TESTS=1
-fi
+BOOTSTRAP_SCRIPT="tests/letstest/scripts/bootstrap_os_packages.sh"
+VENV_PATH=venv3
 
-letsencrypt-auto-source/letsencrypt-auto --install-only -n --debug
-
-if [ "$RUN_RHEL6_TESTS" = 1 ]; then
-  # Enable the SCL Python 3.6 installed by letsencrypt-auto bootstrap
-  PATH="/opt/rh/rh-python36/root/usr/bin:$PATH"
-fi
-
-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)
-
-if [ "$PYTHON_MAJOR_VERSION" = "3" ]; then
-    # Some distros like Fedora may only have an executable named python3 installed.
-    PYTHON_NAME="python3"
-    VENV_PATH="venv3"
-    VENV_SCRIPT="tools/venv3.py"
-else
-    PYTHON_NAME="python"
-    VENV_SCRIPT="tools/venv.py"
-    VENV_PATH="venv"
-fi
-
-VERSION=$("$PYTHON_NAME" letsencrypt-auto-source/version.py)
-
-# setup venv
-CERTBOT_PIP_NO_BINARY=":all:" "$VENV_SCRIPT" --requirement letsencrypt-auto-source/pieces/dependency-requirements.txt
+# bootstrap and setup venv
+sudo $BOOTSTRAP_SCRIPT . "CERTBOT_PIP_NO_BINARY=:all: $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
 
+PLUGINS="certbot-apache certbot-nginx"
+TEMP_DIR=$(mktemp -d)
+
 # build sdists
 for pkg_dir in acme certbot $PLUGINS; do
     cd $pkg_dir