From f4210b31dc839d42d04b8a36796e7b59394d19a4 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Wed, 28 Oct 2020 23:49:29 +0100
Subject: [PATCH] Run unit tests for all Python versions in one CI node. (#2)

---
 shippable.yml                  | 23 +++--------------------
 tests/utils/shippable/units.sh |  5 ++---
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/shippable.yml b/shippable.yml
index da872da8..a0e9ac22 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -15,28 +15,11 @@ matrix:
 
     - env: T=2.9/sanity/1
 
-    - 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=2.10/units/2.6/1
-    - env: T=2.10/units/2.7/1
-    - env: T=2.10/units/3.5/1
-    - env: T=2.10/units/3.6/1
-    - env: T=2.10/units/3.7/1
-    - env: T=2.10/units/3.8/1
-    - env: T=2.10/units/3.9/1
+    - env: T=2.10/units/1
 
-    - env: T=2.9/units/2.6/1
-    - env: T=2.9/units/2.7/1
-    - env: T=2.9/units/3.5/1
-    - env: T=2.9/units/3.6/1
-    - env: T=2.9/units/3.7/1
-    - env: T=2.9/units/3.8/1
+    - env: T=2.9/units/1
 
     # Group 1: docker_swarm
     - env: T=devel/rhel/7.8/1
diff --git a/tests/utils/shippable/units.sh b/tests/utils/shippable/units.sh
index 38e79935..f204dc87 100755
--- a/tests/utils/shippable/units.sh
+++ b/tests/utils/shippable/units.sh
@@ -5,8 +5,7 @@ set -o pipefail -eux
 declare -a args
 IFS='/:' read -ra args <<< "$1"
 
-version="${args[1]}"
-group="${args[2]}"
+group="${args[1]}"
 
 if [[ "${COVERAGE:-}" == "--coverage" ]]; then
     timeout=90
@@ -23,5 +22,5 @@ esac
 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"} \
     "${options[@]:+${options[@]}}" \