mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Reenable consul test, fix issues with a hack (#231)
* Re-enable consul integration tests. * Add hack workaround for https://github.com/ansible/ansible/issues/68701 * Fix typo. ci_complete
This commit is contained in:
parent
81bf52047a
commit
d31b9dfa99
2 changed files with 11 additions and 2 deletions
|
@ -1,4 +1,3 @@
|
|||
shippable/posix/group2
|
||||
destructive
|
||||
skip/aix
|
||||
disabled #fixme
|
||||
|
|
|
@ -47,6 +47,16 @@ 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"
|
||||
|
@ -54,7 +64,7 @@ mkdir -p "${TEST_DIR}"
|
|||
cp -aT "${SHIPPABLE_BUILD_DIR}" "${TEST_DIR}"
|
||||
cd "${TEST_DIR}"
|
||||
|
||||
# STAR: HACK install dependencies
|
||||
# START: HACK install dependencies
|
||||
retry ansible-galaxy -vvv collection install ansible.netcommon
|
||||
retry ansible-galaxy -vvv collection install ansible.posix
|
||||
# https://github.com/CiscoDevNet/ansible-intersight/issues/9
|
||||
|
|
Loading…
Reference in a new issue