Skip to content

Commit

Permalink
Fix OSX hack no longer necessary (#421)
Browse files Browse the repository at this point in the history
ci_complete
  • Loading branch information
felixfontein authored May 27, 2020
1 parent ba2d97f commit b5459d6
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions tests/utils/shippable/shippable.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit b5459d6

Please sign in to comment.