From 7559e912f17b52ab74f17d838261285a56dcf580 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Thu, 29 Oct 2020 15:03:35 +0100
Subject: [PATCH] Run unit tests for all Python versions in one CI node (#133)

* Run unit tests for all Python versions in one CI node.

* Linting.
---
 shippable.yml                  | 14 +++-----------
 tests/utils/shippable/units.sh |  7 +------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/shippable.yml b/shippable.yml
index dd0d8f30..55a47c67 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -11,13 +11,7 @@ matrix:
     - env: T=devel/sanity/1
     - env: T=devel/sanity/extra
 
-    - env: T=devel/units/2.6/1
-    - env: T=devel/units/2.7/1
-    - env: T=devel/units/3.5/1
-    - env: T=devel/units/3.6/1
-    - env: T=devel/units/3.7/1
-    - env: T=devel/units/3.8/1
-    - env: T=devel/units/3.9/1
+    - env: T=devel/units/1
 
     - env: T=devel/osx/10.11/1
     - env: T=devel/rhel/7.8/1
@@ -45,16 +39,14 @@ matrix:
 
     # For Ansible 2.10, use a combination of different targets
     - env: T=2.10/sanity/1
-    - env: T=2.10/units/2.7/1
-    - env: T=2.10/units/3.8/1
+    - env: T=2.10/units/1
     - env: T=2.10/rhel/7.8/1
     - env: T=2.10/linux/ubuntu1804/1
     - env: T=2.10/cloud/3.6/1
 
     # For Ansible 2.9, use a combination of different targets
     - env: T=2.9/sanity/1
-    - env: T=2.9/units/2.7/1
-    - env: T=2.9/units/3.8/1
+    - env: T=2.9/units/1
     - env: T=2.9/rhel/7.8/1
     - env: T=2.9/linux/ubuntu1804/1
     - env: T=2.9/cloud/3.5/1
diff --git a/tests/utils/shippable/units.sh b/tests/utils/shippable/units.sh
index bbb506a1..4bf9e05c 100755
--- a/tests/utils/shippable/units.sh
+++ b/tests/utils/shippable/units.sh
@@ -2,11 +2,6 @@
 
 set -o pipefail -eux
 
-declare -a args
-IFS='/:' read -ra args <<< "$1"
-
-version="${args[1]}"
-
 if [[ "${COVERAGE:-}" == "--coverage" ]]; then
     timeout=90
 else
@@ -16,4 +11,4 @@ fi
 ansible-test env --timeout "${timeout}" --color -v
 
 # shellcheck disable=SC2086
-ansible-test units --color -v --docker default --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
+ansible-test units --color -v --docker default ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \