Fix up network testing on Shippable. (#67678)

This prepares for code coverage collection for initial setup of incidental test coverage.

shippable.yml

@@ -63,7 +63,8 @@ matrix:
     - env: T=windows/2016/7
     - env: T=windows/2019/7
 
-    - env: T=network
+    - env: T=ios/csr1000v/1
+    - env: T=vyos/1.1.8/1
 
     - env: T=aix/7.2/1
     - env: T=osx/10.11/1

test/integration/targets/ios_file/aliases

@@ -0,0 +1 @@
+shippable/ios/group1

test/integration/targets/ios_lacp/aliases

@@ -0,0 +1 @@
+shippable/ios/group1

test/integration/targets/ios_lldp_global/aliases

@@ -0,0 +1 @@
+shippable/ios/group1

test/integration/targets/vyos_banner/aliases

@@ -1 +1 @@
-shippable/network
+shippable/vyos/group1

test/integration/targets/vyos_command/aliases

@@ -1 +1 @@
-shippable/network
+shippable/vyos/group1

test/integration/targets/vyos_config/aliases

@@ -1 +1 @@
-shippable/network
+shippable/vyos/group1

test/integration/targets/vyos_facts/aliases

@@ -1 +1 @@
-shippable/network
+shippable/vyos/group1

test/integration/targets/vyos_firewall_rules/aliases

@@ -0,0 +1 @@
+shippable/vyos/group1

test/integration/targets/vyos_lldp/aliases

@@ -1 +1 @@
-shippable/network
+shippable/vyos/group1

test/integration/targets/vyos_lldp_global/aliases

@@ -0,0 +1 @@
+shippable/vyos/group1

test/integration/targets/vyos_lldp_interface/aliases

@@ -0,0 +1 @@
+shippable/vyos/group1

test/integration/targets/vyos_lldp_interfaces/aliases

@@ -0,0 +1 @@
+shippable/vyos/group1

test/integration/targets/vyos_logging/aliases

@@ -0,0 +1 @@
+shippable/vyos/group1

test/integration/targets/vyos_static_route/aliases

@@ -1 +1 @@
-shippable/network
+shippable/vyos/group1

test/integration/targets/vyos_static_routes/aliases

@@ -0,0 +1 @@
+shippable/vyos/group1

test/integration/targets/vyos_system/aliases

@@ -0,0 +1 @@
+shippable/vyos/group1

test/lib/ansible_test/_data/completion/network.txt

@@ -1,2 +1,2 @@
-ios/csr1000v connection=local
+ios/csr1000v connection=network_cli
 vyos/1.1.8 connection=local

test/utils/shippable/ios.sh

@@ -0,0 +1 @@
+network.sh

test/utils/shippable/network.sh

@@ -2,17 +2,18 @@
 
 set -o pipefail -eux
 
-# shellcheck disable=SC2086
-ansible-test network-integration --explain ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} > /tmp/explain.txt 2>&1 || { cat /tmp/explain.txt && false; }
-{ grep ' network-integration: .* (targeted)$' /tmp/explain.txt || true; } > /tmp/network.txt
+declare -a args
+IFS='/:' read -ra args <<< "$1"
 
-if [ "${COVERAGE}" == "--coverage" ]; then
-    # when on-demand coverage is enabled, force tests to run for all network platforms
-    echo "coverage" > /tmp/network.txt
+platform="${args[0]}"
+version="${args[1]}"
+
+if [ "${#args[@]}" -gt 2 ]; then
+    target="shippable/${platform}/group${args[2]}/"
+else
+    target="shippable/${platform}/"
 fi
 
-target="shippable/network/"
-
 stage="${S:-prod}"
 provider="${P:-default}"
 
@@ -23,27 +24,9 @@ python_versions=(
     3.6
 )
 
-if [ -s /tmp/network.txt ]; then
-    echo "Detected changes requiring integration tests specific to networking:"
-    cat /tmp/network.txt
-
-    echo "Running network integration tests for multiple platforms concurrently."
-
-    platforms=(
-        --platform vyos/1.1.8
-    )
-else
-    echo "No changes requiring integration tests specific to networking were detected."
-    echo "Running network integration tests for a single platform only."
-
-    platforms=(
-        --platform vyos/1.1.8
-    )
-fi
-
-for version in "${python_versions[@]}"; do
+for python_version in "${python_versions[@]}"; do
     # terminate remote instances on the final python version tested
-    if [ "${version}" = "${python_versions[-1]}" ]; then
+    if [ "${python_version}" = "${python_versions[-1]}" ]; then
         terminate="always"
     else
         terminate="never"
@@ -51,7 +34,7 @@ for version in "${python_versions[@]}"; do
 
     # shellcheck disable=SC2086
     ansible-test network-integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \
-         "${platforms[@]}" \
-        --docker default --python "${version}" \
+        --platform "${platform}/${version}" \
+        --docker default --python "${python_version}" \
         --remote-terminate "${terminate}" --remote-stage "${stage}" --remote-provider "${provider}"
 done

test/utils/shippable/vyos.sh

@@ -0,0 +1 @@
+network.sh