diff options
author | Adrien Ferrand <ferrand.ad@gmail.com> | 2020-12-02 01:46:01 +0300 |
---|---|---|
committer | Brad Warren <bmw@eff.org> | 2020-12-02 23:37:38 +0300 |
commit | 1a3c96a9554061a924624b7b30e8e0b9db40a542 (patch) | |
tree | daca9e8a929e31d044f6e318657532f4f004e26a /tests/letstest/scripts/test_leauto_upgrades.sh | |
parent | adacc4ab6dc63b024b17f0ec5adeb1adc9f93300 (diff) |
Deprecate certbot-auto and remove tests
* Completely deprecate certbot-auto
* DeaDeactivate centos6/oraclelinux6 tests
* Remove tests assets
* Remove another test
* Revert "Remove tests assets"
This reverts commit e603afe6c4683a25982351557a348d35eba2f65b.
(cherry picked from commit ff3a07dca34350064bf9f8e9fbe93eda7482acc0)
Diffstat (limited to 'tests/letstest/scripts/test_leauto_upgrades.sh')
-rwxr-xr-x | tests/letstest/scripts/test_leauto_upgrades.sh | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/tests/letstest/scripts/test_leauto_upgrades.sh b/tests/letstest/scripts/test_leauto_upgrades.sh index 51ff640c5..1eeafad21 100755 --- a/tests/letstest/scripts/test_leauto_upgrades.sh +++ b/tests/letstest/scripts/test_leauto_upgrades.sh @@ -105,15 +105,10 @@ if ./letsencrypt-auto -v --debug --version | grep "WARNING: couldn't find Python exit 1 fi -# On systems like Debian where certbot-auto is deprecated, we expect it to -# leave existing Certbot installations unmodified so we check for the same -# version that was initially installed below. Once certbot-auto is deprecated -# on RHEL systems, we can unconditionally check for INITIAL_VERSION. -if [ -f /etc/debian_version ]; then - EXPECTED_VERSION="$INITIAL_VERSION" -else - EXPECTED_VERSION=$(grep -m1 LE_AUTO_VERSION certbot-auto | cut -d\" -f2) -fi +# Since certbot-auto is deprecated, we expect it to leave existing Certbot +# installations unmodified so we check for the same version that was initially +# installed below. +EXPECTED_VERSION="$INITIAL_VERSION" if ! /opt/eff.org/certbot/venv/bin/letsencrypt --version 2>&1 | tail -n1 | grep "^certbot $EXPECTED_VERSION$" ; then echo unexpected certbot version found @@ -124,22 +119,3 @@ if ! diff letsencrypt-auto letsencrypt-auto-source/letsencrypt-auto ; then echo letsencrypt-auto and letsencrypt-auto-source/letsencrypt-auto differ exit 1 fi - -if [ "$RUN_RHEL6_TESTS" = 1 ]; then - # Add the SCL python release to PATH in order to resolve python3 command - PATH="/opt/rh/rh-python36/root/usr/bin:$PATH" - if ! command -v python3; then - echo "Python3 wasn't properly installed" - exit 1 - fi - if [ "$(/opt/eff.org/certbot/venv/bin/python -V 2>&1 | cut -d" " -f 2 | cut -d. -f1)" != 3 ]; then - echo "Python3 wasn't used in venv!" - exit 1 - fi - - if [ "$("$PYTHON_NAME" tools/readlink.py $OLD_VENV_PATH)" != "/opt/eff.org/certbot/venv" ]; then - echo symlink from old venv path not properly created! - exit 1 - fi -fi -echo upgrade appeared to be successful |