From d31b9dfa99627bf4051e6a84e77e7b420bef8021 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Fri, 24 Apr 2020 08:42:44 +0200 Subject: [PATCH] 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 --- tests/integration/targets/consul/aliases | 1 - tests/utils/shippable/shippable.sh | 12 +++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/integration/targets/consul/aliases b/tests/integration/targets/consul/aliases index 708211c313..dde62eec53 100644 --- a/tests/integration/targets/consul/aliases +++ b/tests/integration/targets/consul/aliases @@ -1,4 +1,3 @@ shippable/posix/group2 destructive skip/aix -disabled #fixme diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 018b0a5c62..707304876a 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -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