add x

tests/letstest/scripts/bootstrap_os_packages.sh

@@ -2,7 +2,7 @@
 #
 # Download and run the latest release version of the Certbot client.
 
-set -e  # Work even if somebody does "sh thisscript.sh".
+set -ex  # Work even if somebody does "sh thisscript.sh".
 
 error() {
     echo "$@"

tests/letstest/scripts/test_apache2.sh

@@ -40,18 +40,15 @@ fi
 cd letsencrypt
 
 echo "Bootstrapping dependencies..."
-letsencrypt-auto-source/letsencrypt-auto --os-packages-only
+sudo tests/letstest/scripts/bootstrap_os_packages.sh
 if [ $? -ne 0 ] ; then
     exit 1
 fi
 
-# This script sets the environment variables PYTHON_NAME, VENV_PATH, and
-# VENV_SCRIPT based on the version of Python available on the system. For
-# instance, Fedora uses Python 3 and Python 2 is not installed.
 . tests/letstest/scripts/set_python_envvars.sh
 
-"$VENV_SCRIPT" -e acme[dev] -e certbot[dev,docs] -e certbot-apache
-sudo "$VENV_PATH/bin/certbot" -v --debug --text --agree-tos \
+tools/venv3.py -e acme[dev] -e certbot[dev,docs] -e certbot-apache
+sudo "venv3/bin/certbot" -v --debug --text --agree-tos \
                    --renew-by-default --redirect --register-unsafely-without-email \
                    --domain $PUBLIC_HOSTNAME --server $BOULDER_URL
 if [ $? -ne 0 ] ; then
@@ -68,7 +65,7 @@ elif [ "$OS_TYPE" = "centos" ]; then
 fi
 OPENSSL_VERSION=$(strings "$MOD_SSL_LOCATION" | egrep -o -m1 '^OpenSSL ([0-9]\.[^ ]+) ' | tail -c +9)
 APACHE_VERSION=$(sudo $APACHE_NAME -v | egrep -o 'Apache/([0-9]\.[^ ]+)' | tail -c +8)
-"$PYTHON_NAME" tests/letstest/scripts/test_openssl_version.py "$OPENSSL_VERSION" "$APACHE_VERSION"
+"venv3/bin/python" tests/letstest/scripts/test_openssl_version.py "$OPENSSL_VERSION" "$APACHE_VERSION"
 if [ $? -ne 0 ] ; then
     FAIL=1
 fi
@@ -76,7 +73,7 @@ fi
 
 if [ "$OS_TYPE" = "ubuntu" ] ; then
     export SERVER="$BOULDER_URL"
-    "$VENV_PATH/bin/tox" -e apacheconftest
+    "$venv3/bin/tox" -e apacheconftest
 else
     echo Not running hackish apache tests on $OS_TYPE
 fi

tests/letstest/targets.yaml

@@ -2,75 +2,75 @@
 
 targets:
   #-----------------------------------------------------------------------------
-  #Ubuntu
-  - ami: ami-0545f7036167eb3aa
-    name: ubuntu19.10
-    type: ubuntu
-    virt: hvm
-    user: ubuntu
-  - ami: ami-095192256fe1477ad
-    name: ubuntu18.04LTS
-    type: ubuntu
-    virt: hvm
-    user: ubuntu
-  - ami: ami-09677e0a6b14905b0
-    name: ubuntu16.04LTS
-    type: ubuntu
-    virt: hvm
-    user: ubuntu
-  #-----------------------------------------------------------------------------
-  # Debian
-  - ami: ami-01db78123b2b99496
-    name: debian10
-    type: ubuntu
-    virt: hvm
-    user: admin
-  - ami: ami-003f19e0e687de1cd
-    name: debian9
-    type: ubuntu
-    virt: hvm
-    user: admin
-  - ami: ami-0ed54dd1b25657636
-    name: debian9_arm64
-    type: ubuntu
-    virt: hvm
-    user: admin
-    machine_type: a1.medium
-    # userdata: |
-    #   #cloud-init
-    #   runcmd:
-    #     - [ apt-get, install, -y, curl ]
-  #-----------------------------------------------------------------------------
-  # Other Redhat Distros
-  - ami: ami-0916c408cb02e310b
-    name: RHEL7
-    type: centos
-    virt: hvm
-    user: ec2-user
-  - ami: ami-0c322300a1dd5dc79
-    name: RHEL8
-    type: centos
-    virt: hvm
-    user: ec2-user
-  - ami: ami-0fcbe88944a53b4c8
-    name: fedora31
-    type: centos
-    virt: hvm
-    user: fedora
-  - ami: ami-00bbc6858140f19ed
-    name: fedora30
-    type: centos
-    virt: hvm
-    user: fedora
-  #-----------------------------------------------------------------------------
-  # CentOS
-  # These Marketplace AMIs must, irritatingly, have their terms manually
-  # agreed to on the AWS marketplace site for any new AWS account using them...
-  - ami: ami-9887c6e7
-    name: centos7
-    type: centos
-    virt: hvm
-    user: centos
+  # #Ubuntu
+  # - ami: ami-0545f7036167eb3aa
+  #   name: ubuntu19.10
+  #   type: ubuntu
+  #   virt: hvm
+  #   user: ubuntu
+  # - ami: ami-095192256fe1477ad
+  #   name: ubuntu18.04LTS
+  #   type: ubuntu
+  #   virt: hvm
+  #   user: ubuntu
+  # - ami: ami-09677e0a6b14905b0
+  #   name: ubuntu16.04LTS
+  #   type: ubuntu
+  #   virt: hvm
+  #   user: ubuntu
+  # #-----------------------------------------------------------------------------
+  # # Debian
+  # - ami: ami-01db78123b2b99496
+  #   name: debian10
+  #   type: ubuntu
+  #   virt: hvm
+  #   user: admin
+  # - ami: ami-003f19e0e687de1cd
+  #   name: debian9
+  #   type: ubuntu
+  #   virt: hvm
+  #   user: admin
+  # - ami: ami-0ed54dd1b25657636
+  #   name: debian9_arm64
+  #   type: ubuntu
+  #   virt: hvm
+  #   user: admin
+  #   machine_type: a1.medium
+  #   # userdata: |
+  #   #   #cloud-init
+  #   #   runcmd:
+  #   #     - [ apt-get, install, -y, curl ]
+  # #-----------------------------------------------------------------------------
+  # # Other Redhat Distros
+  # - ami: ami-0916c408cb02e310b
+  #   name: RHEL7
+  #   type: centos
+  #   virt: hvm
+  #   user: ec2-user
+  # - ami: ami-0c322300a1dd5dc79
+  #   name: RHEL8
+  #   type: centos
+  #   virt: hvm
+  #   user: ec2-user
+  # - ami: ami-0fcbe88944a53b4c8
+  #   name: fedora31
+  #   type: centos
+  #   virt: hvm
+  #   user: fedora
+  # - ami: ami-00bbc6858140f19ed
+  #   name: fedora30
+  #   type: centos
+  #   virt: hvm
+  #   user: fedora
+  # #-----------------------------------------------------------------------------
+  # # CentOS
+  # # These Marketplace AMIs must, irritatingly, have their terms manually
+  # # agreed to on the AWS marketplace site for any new AWS account using them...
+  # - ami: ami-9887c6e7
+  #   name: centos7
+  #   type: centos
+  #   virt: hvm
+  #   user: centos
   # centos6 requires EPEL repo added
   - ami: ami-1585c46a
     name: centos6
@@ -82,8 +82,8 @@ targets:
       runcmd:
         - yum install -y epel-release
         - iptables -F
-  - ami: ami-01ca03df4a6012157
-    name: centos8
-    type: centos
-    virt: hvm
-    user: centos
+  # - ami: ami-01ca03df4a6012157
+  #   name: centos8
+  #   type: centos
+  #   virt: hvm
+  #   user: centos