From 5686c74e76d7815213144d1211fd14fd33e170f1 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 23 Apr 2020 22:48:52 +0200 Subject: [PATCH] Hack, v2. (#36) ci_complete --- tests/utils/shippable/shippable.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index a3111c1c..ba5504ac 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -63,9 +63,11 @@ fi # START: HACK if [ "${script}" == "osx" ]; then - # Make sure that the latest versions of pyOpenSSL and cryptography are installed on macOS. - # This is necessary until https://github.com/ansible/ansible/issues/68701 has been fixed. - retry pip install --upgrade pyOpenSSL cryptography + # 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