From 4a9d778cca62ae2bec4cf060726e88f1fd66f374 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Mon, 26 Feb 2018 15:59:57 -0800 Subject: [PATCH] Don't run tests with Python 2.6. --- letsencrypt-auto-source/Dockerfile.centos6 | 8 +------- letsencrypt-auto-source/tests/centos6_tests.sh | 7 ++++++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/letsencrypt-auto-source/Dockerfile.centos6 b/letsencrypt-auto-source/Dockerfile.centos6 index 47eb48f50..1f204e78e 100644 --- a/letsencrypt-auto-source/Dockerfile.centos6 +++ b/letsencrypt-auto-source/Dockerfile.centos6 @@ -5,13 +5,7 @@ FROM centos:6 RUN yum install -y epel-release -# Install pip and sudo: -RUN yum install -y python-pip sudo -# Use pipstrap to update to a stable and tested version of pip -COPY ./pieces/pipstrap.py /opt -RUN /opt/pipstrap.py -# Pin pytest version for increased stability -RUN pip install pytest==3.2.5 +RUN yum install -y sudo # Add an unprivileged user: RUN useradd --create-home --home-dir /home/lea --shell /bin/bash --groups wheel --uid 1000 lea diff --git a/letsencrypt-auto-source/tests/centos6_tests.sh b/letsencrypt-auto-source/tests/centos6_tests.sh index 2c6dcf734..d12eaf3f9 100644 --- a/letsencrypt-auto-source/tests/centos6_tests.sh +++ b/letsencrypt-auto-source/tests/centos6_tests.sh @@ -77,5 +77,10 @@ if [ "$($VENV_PATH/bin/python -V 2>&1 | cut -d" " -f2 | cut -d. -f1)" != 3 ]; th fi unset VENV_PATH -# test using python3 +# test using python2.7 +source /opt/rh/python27/enable +# Use pipstrap to update to a stable and tested version of pip +certbot/letsencryot-auto-source/pieces/pipstrap.py +# Pin pytest version for increased stability +pip install pytest==3.2.5 pytest -v -s certbot/letsencrypt-auto-source/tests