From 744297494dd12a132a283c6db7017547465bf09c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20K=C3=A4mmerling?=
 <lukas.kaemmerling@hetzner-cloud.de>
Date: Fri, 31 Jul 2020 07:22:31 +0200
Subject: [PATCH] Fix tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
---
 shippable.yml                      |  1 -
 tests/utils/shippable/sanity.sh    |  2 +-
 tests/utils/shippable/shippable.sh | 18 +++++++++---------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/shippable.yml b/shippable.yml
index 8da0b50..4ccc627 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -22,7 +22,6 @@ matrix:
     - env: T=2.10/sanity/2
     - env: T=2.10/sanity/3
     - env: T=2.10/sanity/4
-    - env: T=2.10/sanity/extra
 
     - env: T=2.10/hcloud/3.8/1
     - env: T=2.10/hcloud/3.8/2
diff --git a/tests/utils/shippable/sanity.sh b/tests/utils/shippable/sanity.sh
index a9547f3..e3b0c01 100755
--- a/tests/utils/shippable/sanity.sh
+++ b/tests/utils/shippable/sanity.sh
@@ -41,4 +41,4 @@ fi
 ansible-test sanity --color -v --junit ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
     --docker --base-branch "${base_branch}" \
     --exclude shippable.yml --exclude tests/utils/ \
-    "${options[@]}" --allow-disabled --python 3.8
+    "${options[@]}" --allow-disabled
diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh
index 807f41d..9303277 100755
--- a/tests/utils/shippable/shippable.sh
+++ b/tests/utils/shippable/shippable.sh
@@ -30,8 +30,8 @@ if [ -d /home/shippable/cache/ ]; then
     ls -la /home/shippable/cache/
 fi
 
-command -v python3
-python3 -V
+command -v python
+python -V
 
 function retry
 {
@@ -49,13 +49,13 @@ function retry
     exit -1
 }
 
-command -v python3 -m pip
-python3 -m pip --version
-python3 -m pip list --disable-pip-version-check
+command -v pip
+pip --version
+pip list --disable-pip-version-check
 if [ "${ansible_version}" == "devel" ]; then
-    retry python3 -m 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
 else
-    retry python3 -m pip install "https://github.com/ansible/ansible/archive/stable-${ansible_version}.tar.gz" --disable-pip-version-check
+    retry 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 python3 -m pip install hcloud
-retry python3 -m pip install netaddr --disable-pip-version-check
+retry pip install hcloud
+retry pip install netaddr --disable-pip-version-check
 retry ansible-galaxy -vvv collection install community.internal_test_tools
 # END: HACK