From 3d20950fb89143e40b3fe1b22bf9a44840354725 Mon Sep 17 00:00:00 2001
From: Noah Swartz <noah@eff.org>
Date: Tue, 15 Dec 2015 10:59:13 -0800
Subject: [PATCH] modified to allow pip variable

---
 multitester.py          | 4 ++++
 scripts/test_apache2.sh | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/multitester.py b/multitester.py
index aaba1ed07..ab8a9b29e 100644
--- a/multitester.py
+++ b/multitester.py
@@ -74,6 +74,9 @@ parser.add_argument('--merge_master',
 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',
+                    help="server from which to pull candidate release packages")
 cl_args = parser.parse_args()
 
 # Credential Variables
@@ -277,6 +280,7 @@ def install_and_launch_letsencrypt(instance, boulder_url, target):
                    PUBLIC_IP=instance.public_ip_address,
                    PRIVATE_IP=instance.private_ip_address,
                    PUBLIC_HOSTNAME=instance.public_dns_name,
+                   PIP_EXTRA_INDEX_URL=cl_args.alt_pip,
                    OS_TYPE=target['type']):
         execute(deploy_script, cl_args.test_script)
 
diff --git a/scripts/test_apache2.sh b/scripts/test_apache2.sh
index 772300589..803385e43 100755
--- a/scripts/test_apache2.sh
+++ b/scripts/test_apache2.sh
@@ -36,9 +36,6 @@ fi
 
 # run letsencrypt-apache2 via letsencrypt-auto
 cd letsencrypt
-./bootstrap/install-deps.sh
-./bootstrap/dev/venv.sh
-source ./venv/bin/activate
-sudo ./venv/bin/letsencrypt -v --debug --text --agree-dev-preview --agree-tos \
+letsencrypt-auto -v --debug --text --agree-dev-preview --agree-tos \
                    --renew-by-default --redirect --register-unsafely-without-email \
                    --domain $PUBLIC_HOSTNAME --server $BOULDER_URL