From 1289e56ab172975fdcfd201946288b64b0a60d72 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 23 Apr 2020 22:02:56 +0200 Subject: [PATCH] Hack: install latest cryptography + pyOpenSSL versions on macOS until https://github.com/ansible/ansible/issues/68701 has been fixed (#35) --- tests/utils/shippable/shippable.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index c1f141ac..a3111c1c 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -61,6 +61,14 @@ else COMPLETE=yes 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 +fi +# END: HACK + export ANSIBLE_COLLECTIONS_PATHS="${HOME}/.ansible" SHIPPABLE_RESULT_DIR="$(pwd)/shippable" TEST_DIR="${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/crypto" @@ -68,7 +76,7 @@ mkdir -p "${TEST_DIR}" cp -aT "${SHIPPABLE_BUILD_DIR}" "${TEST_DIR}" cd "${TEST_DIR}" -# STAR: HACK install integration test dependencies +# START: HACK install integration test dependencies if [ "${script}" != "units" ] && [ "${script}" != "sanity" ] && [ "${ansible_version}" != "2.9" ]; then retry ansible-galaxy -vvv collection install community.general fi