From b5459d63160cea9d9d85f44a1d4853f2b158dd10 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Wed, 27 May 2020 08:14:20 +0200 Subject: [PATCH] Fix OSX hack no longer necessary (#421) ci_complete --- tests/utils/shippable/shippable.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 07140162a8..6cb46d624e 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -48,16 +48,6 @@ pip --version pip list --disable-pip-version-check retry pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check -# START: HACK -if [ "${script}" == "osx" ]; then - # Make sure that the latest versions of pyOpenSSL and cryptography will be installed on macOS before - # ansible-playbook is started. This is necessary until https://github.com/ansible/ansible/issues/68701 - # has been fixed. - sed -i -e 's/cryptography.*/cryptography >= 2.9.2/g' /root/venv/lib/python2.7/site-packages/ansible_test/_data/requirements/integration.txt - echo 'pyOpenSSL >= 19.1.0' >> /root/venv/lib/python2.7/site-packages/ansible_test/_data/requirements/integration.txt -fi -# END: HACK - export ANSIBLE_COLLECTIONS_PATHS="${HOME}/.ansible" SHIPPABLE_RESULT_DIR="$(pwd)/shippable" TEST_DIR="${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/general"