From 5a91ed0a3be0ea4910052535f65fd5c64bf029fe Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Tue, 3 Oct 2017 14:37:05 -0700 Subject: Switch CI for OS X back to a single job. (#31265) * Update Shippable scripts for group/non-group use. * Switch CI for OS X back to a single job. --- test/utils/shippable/rhel.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'test/utils/shippable/rhel.sh') diff --git a/test/utils/shippable/rhel.sh b/test/utils/shippable/rhel.sh index a7459d72d1..603b1a08c4 100755 --- a/test/utils/shippable/rhel.sh +++ b/test/utils/shippable/rhel.sh @@ -7,8 +7,14 @@ IFS='/:' read -ra args <<< "$1" platform="${args[0]}" version="${args[1]}" -target="posix/ci/" + +if [ "${#args[@]}" -gt 2 ]; then + target="posix/ci/group${args[2]}/" +else + target="posix/ci/" +fi # shellcheck disable=SC2086 -ansible-test integration --color -v --retry-on-error "${target}" --remote "${platform}/${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \ - --exclude "posix/ci/cloud/" +ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \ + --exclude "posix/ci/cloud/" \ + --remote "${platform}/${version}" --remote-terminate always -- cgit v1.2.1