Fix unit test paths in tests/utils/shippable/units.sh, removing fallaxy targets (#40)

* Fix unit test paths.

* Remove fallaxy targets.

* Remove unit test group 3.

* Avoid sanity tests to fail because they validate something in tests/utils/.

shippable.yml

@@ -30,14 +30,6 @@ matrix:
     - env: T=units/3.8/2
     - env: T=units/3.9/2
 
-    - env: T=units/2.6/3
-    - env: T=units/2.7/3
-    - env: T=units/3.5/3
-    - env: T=units/3.6/3
-    - env: T=units/3.7/3
-    - env: T=units/3.8/3
-    - env: T=units/3.9/3
-
     - env: T=aix/7.2/1
     - env: T=osx/10.11/1
     - env: T=rhel/7.6/1
@@ -118,9 +110,6 @@ matrix:
     - env: T=linux/ubuntu1604/5
     - env: T=linux/ubuntu1804/5
 
-    - env: T=fallaxy/2.7/1
-    - env: T=fallaxy/3.6/1
-
     - env: T=cs/2.7/1
     - env: T=cs/3.6/1
 

tests/utils/shippable/sanity.sh

@@ -35,4 +35,5 @@ fi
 # shellcheck disable=SC2086
 ansible-test sanity --color -v --junit ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
     --docker --base-branch "${base_branch}" \
+    --exclude shippable.yml --exclude tests/utils/ \
     "${options[@]}" --allow-disabled

tests/utils/shippable/units.sh

@@ -18,7 +18,7 @@ group1=()
 group2=()
 group3=()
 
-# create three groups by putting network tests into separate groups
+# create two groups by putting network tests into another group
 # add or remove network platforms as needed to balance the groups
 
 networks2=(
@@ -69,12 +69,8 @@ networks2=(
     vyos
 )
 
-networks3=(
-    fortios
-)
-
 for network in "${networks2[@]}"; do
-    test_path="test/units/modules/network/${network}/"
+    test_path="tests/unit/modules/network/${network}/"
 
     if [ -d "${test_path}" ]; then
         group1+=(--exclude "${test_path}")
@@ -82,19 +78,9 @@ for network in "${networks2[@]}"; do
     fi
 done
 
-for network in "${networks3[@]}"; do
-    test_path="test/units/modules/network/${network}/"
-
-    if [ -d "${test_path}" ]; then
-        group1+=(--exclude "${test_path}")
-        group3+=("${test_path}")
-    fi
-done
-
 case "${group}" in
     1) options=("${group1[@]:+${group1[@]}}") ;;
     2) options=("${group2[@]:+${group2[@]}}") ;;
-    3) options=("${group3[@]:+${group3[@]}}") ;;
 esac
 
 if [ ${#options[@]} -eq 0 ] && [ "${group}" -gt 1 ]; then