1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Fix OSX hack no longer necessary (#421)

ci_complete
This commit is contained in:
Felix Fontein 2020-05-27 08:14:20 +02:00 committed by GitHub
parent ba2d97f067
commit b5459d6316
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -48,16 +48,6 @@ pip --version
pip list --disable-pip-version-check pip list --disable-pip-version-check
retry pip install https://github.com/ansible/ansible/archive/devel.tar.gz --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" export ANSIBLE_COLLECTIONS_PATHS="${HOME}/.ansible"
SHIPPABLE_RESULT_DIR="$(pwd)/shippable" SHIPPABLE_RESULT_DIR="$(pwd)/shippable"
TEST_DIR="${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/general" TEST_DIR="${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/general"