From f545197667670abd8db2a5f6fbf50e6aecb76a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20K=C3=A4mmerling?= Date: Fri, 31 Jul 2020 07:17:00 +0200 Subject: [PATCH] Use py3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukas Kämmerling --- tests/utils/shippable/shippable.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 78bdb05..807f41d 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -49,13 +49,13 @@ function retry exit -1 } -command -v pip3 -pip3 --version -pip3 list --disable-pip-version-check +command -v python3 -m pip +python3 -m pip --version +python3 -m pip list --disable-pip-version-check if [ "${ansible_version}" == "devel" ]; then - retry pip3 install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check + retry python3 -m pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check else - retry pip3 install "https://github.com/ansible/ansible/archive/stable-${ansible_version}.tar.gz" --disable-pip-version-check + retry python3 -m pip install "https://github.com/ansible/ansible/archive/stable-${ansible_version}.tar.gz" --disable-pip-version-check fi export ANSIBLE_COLLECTIONS_PATHS="${HOME}/.ansible" SHIPPABLE_RESULT_DIR="$(pwd)/shippable" @@ -68,8 +68,8 @@ cd "${TEST_DIR}" retry ansible-galaxy -vvv collection install community.general retry ansible-galaxy -vvv collection install ansible.netcommon -retry pip3 install hcloud -retry pip3 install netaddr --disable-pip-version-check +retry python3 -m pip install hcloud +retry python3 -m pip install netaddr --disable-pip-version-check retry ansible-galaxy -vvv collection install community.internal_test_tools # END: HACK