12 files changed, 40 insertions, 22 deletions
diff --git a/test/utils/shippable/aws.sh b/test/utils/shippable/aws.sh
new file mode 120000
index 0000000000..700ad3edcf
--- /dev/null
+++ b/test/utils/shippable/aws.sh
@@ -0,0 +1 @@
+cloud.sh
+\ No newline at end of file
diff --git a/test/utils/shippable/azure.sh b/test/utils/shippable/azure.sh
new file mode 120000
index 0000000000..700ad3edcf
--- /dev/null
+++ b/test/utils/shippable/azure.sh
@@ -0,0 +1 @@
+cloud.sh
+\ No newline at end of file
diff --git a/test/utils/shippable/cloud.sh b/test/utils/shippable/cloud.sh
index cfc6153e31..46ed859057 100755
--- a/test/utils/shippable/cloud.sh
+++ b/test/utils/shippable/cloud.sh
@@ -5,13 +5,28 @@ set -o pipefail
 declare -a args
 IFS='/:' read -ra args <<< "$1"
 
-image="${args[1]}"
-python="${args[2]}"
-target="posix/ci/cloud/group${args[3]}/"
+cloud="${args[0]}"
+python="${args[1]}"
+group="${args[2]}"
+
+target="shippable/${cloud}/group${group}/"
 
 stage="${S:-prod}"
 
+if [ "${group}" == "1" ]; then
+    # only run smoketest tests for group1
+    changed_all_target="shippable/${cloud}/smoketest/"
+
+    if ! ansible-test integration "${changed_all_target}" --list-targets > /dev/null 2>&1; then
+        # no smoketest tests are available for this cloud
+        changed_all_target="none"
+    fi
+else
+    # smoketest tests already covered by group1
+    changed_all_target="none"
+fi
+
 # shellcheck disable=SC2086
 ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \
     --remote-terminate always --remote-stage "${stage}" \
-    --docker "${image}" --python "${python}" --changed-all-target "${target}smoketest/"
+    --docker --python "${python}" --changed-all-target "${changed_all_target}"
diff --git a/test/utils/shippable/cs.sh b/test/utils/shippable/cs.sh
new file mode 120000
index 0000000000..700ad3edcf
--- /dev/null
+++ b/test/utils/shippable/cs.sh
@@ -0,0 +1 @@
+cloud.sh
+\ No newline at end of file
diff --git a/test/utils/shippable/freebsd.sh b/test/utils/shippable/freebsd.sh
index f7159eec7f..a14441e74c 100755
--- a/test/utils/shippable/freebsd.sh
+++ b/test/utils/shippable/freebsd.sh
@@ -9,9 +9,9 @@ platform="${args[0]}"
 version="${args[1]}"
 
 if [ "${#args[@]}" -gt 2 ]; then
-    target="posix/ci/group${args[2]}/"
+    target="shippable/posix/group${args[2]}/"
 else
-    target="posix/ci/"
+    target="shippable/posix/"
 fi
 
 stage="${S:-prod}"
@@ -19,5 +19,4 @@ provider="${P:-default}"
 
 # shellcheck disable=SC2086
 ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \
-    --exclude "posix/ci/cloud/" \
     --remote "${platform}/${version}" --remote-terminate always --remote-stage "${stage}" --remote-provider "${provider}"
diff --git a/test/utils/shippable/linux.sh b/test/utils/shippable/linux.sh
index dcebb9ee97..44903b2bec 100755
--- a/test/utils/shippable/linux.sh
+++ b/test/utils/shippable/linux.sh
@@ -8,12 +8,11 @@ IFS='/:' read -ra args <<< "$1"
 image="${args[1]}"
 
 if [ "${#args[@]}" -gt 2 ]; then
-    target="posix/ci/group${args[2]}/"
+    target="shippable/posix/group${args[2]}/"
 else
-    target="posix/ci/"
+    target="shippable/posix/"
 fi
 
 # shellcheck disable=SC2086
 ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \
-    --exclude "posix/ci/cloud/" \
     --docker "${image}"
diff --git a/test/utils/shippable/network.sh b/test/utils/shippable/network.sh
index ecc01fcf17..3d58dc5983 100755
--- a/test/utils/shippable/network.sh
+++ b/test/utils/shippable/network.sh
@@ -11,7 +11,7 @@ if [ "${COVERAGE}" ]; then
     echo "coverage" > /tmp/network.txt
 fi
 
-target="network/ci/"
+target="shippable/network/"
 
 stage="${S:-prod}"
 provider="${P:-default}"
diff --git a/test/utils/shippable/osx.sh b/test/utils/shippable/osx.sh
index f7159eec7f..a14441e74c 100755
--- a/test/utils/shippable/osx.sh
+++ b/test/utils/shippable/osx.sh
@@ -9,9 +9,9 @@ platform="${args[0]}"
 version="${args[1]}"
 
 if [ "${#args[@]}" -gt 2 ]; then
-    target="posix/ci/group${args[2]}/"
+    target="shippable/posix/group${args[2]}/"
 else
-    target="posix/ci/"
+    target="shippable/posix/"
 fi
 
 stage="${S:-prod}"
@@ -19,5 +19,4 @@ provider="${P:-default}"
 
 # shellcheck disable=SC2086
 ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \
-    --exclude "posix/ci/cloud/" \
     --remote "${platform}/${version}" --remote-terminate always --remote-stage "${stage}" --remote-provider "${provider}"
diff --git a/test/utils/shippable/rhel.sh b/test/utils/shippable/rhel.sh
index f7159eec7f..a14441e74c 100755
--- a/test/utils/shippable/rhel.sh
+++ b/test/utils/shippable/rhel.sh
@@ -9,9 +9,9 @@ platform="${args[0]}"
 version="${args[1]}"
 
 if [ "${#args[@]}" -gt 2 ]; then
-    target="posix/ci/group${args[2]}/"
+    target="shippable/posix/group${args[2]}/"
 else
-    target="posix/ci/"
+    target="shippable/posix/"
 fi
 
 stage="${S:-prod}"
@@ -19,5 +19,4 @@ provider="${P:-default}"
 
 # shellcheck disable=SC2086
 ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \
-    --exclude "posix/ci/cloud/" \
     --remote "${platform}/${version}" --remote-terminate always --remote-stage "${stage}" --remote-provider "${provider}"
diff --git a/test/utils/shippable/tower.sh b/test/utils/shippable/tower.sh
new file mode 120000
index 0000000000..700ad3edcf
--- /dev/null
+++ b/test/utils/shippable/tower.sh
@@ -0,0 +1 @@
+cloud.sh
+\ No newline at end of file
diff --git a/test/utils/shippable/vcenter.sh b/test/utils/shippable/vcenter.sh
new file mode 120000
index 0000000000..700ad3edcf
--- /dev/null
+++ b/test/utils/shippable/vcenter.sh
@@ -0,0 +1 @@
+cloud.sh
+\ No newline at end of file
diff --git a/test/utils/shippable/windows.sh b/test/utils/shippable/windows.sh
index 9410bdaa2b..8b19388dfc 100755
--- a/test/utils/shippable/windows.sh
+++ b/test/utils/shippable/windows.sh
@@ -6,7 +6,9 @@ declare -a args
 IFS='/:' read -ra args <<< "$1"
 
 version="${args[1]}"
-target="windows/ci/group${args[2]}/"
+group="${args[2]}"
+
+target="shippable/windows/group${group}/"
 
 stage="${S:-prod}"
 provider="${P:-default}"
@@ -59,9 +61,9 @@ for version in "${python_versions[@]}"; do
             # with change detection enabled run tests for anything changed
             # use the smoketest tests for any change that triggers all tests
             ci="${target}"
-            if [ "${target}" == "windows/ci/group1/" ]; then
+            if [ "${target}" == "shippable/windows/group1/" ]; then
                 # only run smoketest tests for group1
-                changed_all_target="windows/ci/smoketest/"
+                changed_all_target="shippable/windows/smoketest/"
             else
                 # smoketest tests already covered by group1
                 changed_all_target="none"
@@ -72,9 +74,9 @@ for version in "${python_versions[@]}"; do
         fi
     else
         # only run minimal tests for group1
-        if [ "${target}" != "windows/ci/group1/" ]; then continue; fi
+        if [ "${target}" != "shippable/windows/group1/" ]; then continue; fi
         # minimal tests for other python versions
-        ci="windows/ci/minimal/"
+        ci="shippable/windows/minimal/"
     fi
 
     # terminate remote instances on the final python version tested