1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

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.
This commit is contained in:
Matt Clay 2017-10-03 14:37:05 -07:00 committed by GitHub
parent 9c6d7ddeb5
commit 5a91ed0a3b
6 changed files with 38 additions and 16 deletions

View file

@ -15,6 +15,7 @@ matrix:
- env: T=units/3.5 - env: T=units/3.5
- env: T=units/3.6 - env: T=units/3.6
- env: T=osx/10.11
- env: T=rhel/7.4 - env: T=rhel/7.4
- env: T=windows/1 - env: T=windows/1
@ -23,7 +24,6 @@ matrix:
- env: T=network - env: T=network
- env: T=osx/10.11/1
- env: T=freebsd/10.3-STABLE/1 - env: T=freebsd/10.3-STABLE/1
- env: T=freebsd/11.0-STABLE/1 - env: T=freebsd/11.0-STABLE/1
- env: T=linux/centos6/1 - env: T=linux/centos6/1
@ -36,7 +36,6 @@ matrix:
- env: T=linux/ubuntu1604/1 - env: T=linux/ubuntu1604/1
- env: T=linux/ubuntu1604py3/1 - env: T=linux/ubuntu1604py3/1
- env: T=osx/10.11/2
- env: T=freebsd/10.3-STABLE/2 - env: T=freebsd/10.3-STABLE/2
- env: T=freebsd/11.0-STABLE/2 - env: T=freebsd/11.0-STABLE/2
- env: T=linux/centos6/2 - env: T=linux/centos6/2
@ -49,7 +48,6 @@ matrix:
- env: T=linux/ubuntu1604/2 - env: T=linux/ubuntu1604/2
- env: T=linux/ubuntu1604py3/2 - env: T=linux/ubuntu1604py3/2
- env: T=osx/10.11/3
- env: T=freebsd/10.3-STABLE/3 - env: T=freebsd/10.3-STABLE/3
- env: T=freebsd/11.0-STABLE/3 - env: T=freebsd/11.0-STABLE/3
- env: T=linux/centos6/3 - env: T=linux/centos6/3

View file

@ -5,9 +5,9 @@ set -o pipefail
declare -a args declare -a args
IFS='/:' read -ra args <<< "$1" IFS='/:' read -ra args <<< "$1"
image="ansible/ansible:${args[1]}" image="${args[1]}"
target="posix/ci/cloud/group${args[2]}/" target="posix/ci/cloud/group${args[2]}/"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
ansible-test integration --color -v --retry-on-error "${target}" --docker "${image}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \ ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
--changed-all-target "${target}smoketest/" --docker "${image}" --changed-all-target "${target}smoketest/"

View file

@ -7,8 +7,14 @@ IFS='/:' read -ra args <<< "$1"
platform="${args[0]}" platform="${args[0]}"
version="${args[1]}" version="${args[1]}"
target="posix/ci/group${args[2]}/"
if [ "${#args[@]}" -gt 2 ]; then
target="posix/ci/group${args[2]}/"
else
target="posix/ci/"
fi
# shellcheck disable=SC2086 # shellcheck disable=SC2086
ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \ ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
--exclude "posix/ci/cloud/" \
--remote "${platform}/${version}" --remote-terminate always --remote "${platform}/${version}" --remote-terminate always

View file

@ -5,9 +5,15 @@ set -o pipefail
declare -a args declare -a args
IFS='/:' read -ra args <<< "$1" IFS='/:' read -ra args <<< "$1"
image="ansible/ansible:${args[1]}" image="${args[1]}"
target="posix/ci/group${args[2]}/"
if [ "${#args[@]}" -gt 2 ]; then
target="posix/ci/group${args[2]}/"
else
target="posix/ci/"
fi
# shellcheck disable=SC2086 # shellcheck disable=SC2086
ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \ ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
--exclude "posix/ci/cloud/" \
--docker "${image}" --docker "${image}"

View file

@ -7,8 +7,14 @@ IFS='/:' read -ra args <<< "$1"
platform="${args[0]}" platform="${args[0]}"
version="${args[1]}" version="${args[1]}"
target="posix/ci/group${args[2]}/"
if [ "${#args[@]}" -gt 2 ]; then
target="posix/ci/group${args[2]}/"
else
target="posix/ci/"
fi
# shellcheck disable=SC2086 # shellcheck disable=SC2086
ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \ ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
--exclude "posix/ci/cloud/" \
--remote "${platform}/${version}" --remote-terminate always --remote "${platform}/${version}" --remote-terminate always

View file

@ -7,8 +7,14 @@ IFS='/:' read -ra args <<< "$1"
platform="${args[0]}" platform="${args[0]}"
version="${args[1]}" 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 # shellcheck disable=SC2086
ansible-test integration --color -v --retry-on-error "${target}" --remote "${platform}/${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \ ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
--exclude "posix/ci/cloud/" --exclude "posix/ci/cloud/" \
--remote "${platform}/${version}" --remote-terminate always