cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add support for on-demand coverage on Shippable.

Browse source 
Triggered by setting the COVERAGE environment var to a non-empty value.
Alternatively the string `ci_coverage` can be added to a commit message.
This commit is contained in:
Matt Clay 2017-05-07 16:32:19 +08:00
parent dfd19a812f
commit 7b3f0b8870
8 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/utils/shippable/cloud.sh
View file

@ -8,4 +8,4 @@ IFS='/:' read -ra args <<< "${TEST}"
image="ansible/ansible:${args[1]}" image="ansible/ansible:${args[1]}"
target="posix/ci/cloud/" target="posix/ci/cloud/"
ansible-test integration --color -v --retry-on-error "${target}" --docker "${image}" ansible-test integration --color -v --retry-on-error "${target}" --docker "${image}" "${COVERAGE}"

2
test/utils/shippable/freebsd.sh
View file

@ -9,4 +9,4 @@ platform="${args[0]}"
version="${args[1]}" version="${args[1]}"
target="posix/ci/" target="posix/ci/"
ansible-test integration --color -v --retry-on-error "${target}" --remote "${platform}/${version}" --exclude "posix/ci/cloud/" ansible-test integration --color -v --retry-on-error "${target}" --remote "${platform}/${version}" --exclude "posix/ci/cloud/" "${COVERAGE}"

2
test/utils/shippable/linux.sh
View file

@ -8,4 +8,4 @@ IFS='/:' read -ra args <<< "${TEST}"
image="ansible/ansible:${args[1]}" image="ansible/ansible:${args[1]}"
target="posix/ci/group${args[2]}/" target="posix/ci/group${args[2]}/"
ansible-test integration --color -v --retry-on-error "${target}" --docker "${image}" ansible-test integration --color -v --retry-on-error "${target}" --docker "${image}" "${COVERAGE}"

4
test/utils/shippable/network.sh
View file

@ -12,7 +12,7 @@ if [ -s /tmp/network.txt ]; then
echo "Running network integration tests for multiple platforms concurrently." echo "Running network integration tests for multiple platforms concurrently."
ansible-test network-integration --color -v --retry-on-error "${target}" --requirements \ ansible-test network-integration --color -v --retry-on-error "${target}" --requirements "${COVERAGE}" \
--platform vyos/1.1.0 \ --platform vyos/1.1.0 \
--platform ios/csr1000v \ --platform ios/csr1000v \
@ -20,6 +20,6 @@ else
echo "No changes requiring integration tests specific to networking were detected." echo "No changes requiring integration tests specific to networking were detected."
echo "Running network integration tests for a single platform only." echo "Running network integration tests for a single platform only."
ansible-test network-integration --color -v --retry-on-error "${target}" --requirements \ ansible-test network-integration --color -v --retry-on-error "${target}" --requirements "${COVERAGE}" \
--platform vyos/1.1.0 --platform vyos/1.1.0
fi fi

3
test/utils/shippable/osx.sh
View file

@ -9,4 +9,5 @@ platform="${args[0]}"
version="${args[1]}" version="${args[1]}"
target="posix/ci/" target="posix/ci/"
ansible-test integration --color -v --retry-on-error "${target}" --remote "${platform}/${version}" --remote-terminate success --exclude "posix/ci/cloud/" ansible-test integration --color -v --retry-on-error "${target}" --remote "${platform}/${version}" --remote-terminate success --exclude "posix/ci/cloud/" \
"${COVERAGE}"

4
test/utils/shippable/other.sh
View file

@ -10,8 +10,8 @@ retry.py pip install tox --disable-pip-version-check
echo '{"verified": false, "results": []}' > test/results/bot/ansible-test-failure.json echo '{"verified": false, "results": []}' > test/results/bot/ansible-test-failure.json
ansible-test compile --failure-ok --color -v --junit --requirements ansible-test compile --failure-ok --color -v --junit --requirements --coverage
ansible-test sanity --failure-ok --color -v --junit --tox --skip-test ansible-doc --python 3.5 ansible-test sanity --failure-ok --color -v --junit --tox --skip-test ansible-doc --python 3.5 --coverage
ansible-test sanity --failure-ok --color -v --junit --tox --test ansible-doc --coverage ansible-test sanity --failure-ok --color -v --junit --tox --test ansible-doc --coverage
rm test/results/bot/ansible-test-failure.json rm test/results/bot/ansible-test-failure.json

6
test/utils/shippable/shippable.sh
View file

@ -23,6 +23,12 @@ pip list --disable-pip-version-check
export PATH="test/runner:${PATH}" export PATH="test/runner:${PATH}"
export PYTHONIOENCODING='utf-8' export PYTHONIOENCODING='utf-8'
export COVERAGE="${COVERAGE:-}"
# run integration coverage if 'ci_coverage' is in the commit message or the COVERAGE var is non-empty
if [[ "${COMMIT_MESSAGE}" =~ ci_coverage ]] || [ -n "${COVERAGE}" ]; then
export COVERAGE="--coverage"
fi
# remove empty core/extras module directories from PRs created prior to the repo-merge # remove empty core/extras module directories from PRs created prior to the repo-merge
find lib/ansible/modules -type d -empty -print -delete find lib/ansible/modules -type d -empty -print -delete

4
test/utils/shippable/windows.sh
View file

@ -22,7 +22,7 @@ if [ -s /tmp/windows.txt ]; then
target="windows/ci/" target="windows/ci/"
ansible-test windows-integration --color -v --retry-on-error "${target}" --requirements \ ansible-test windows-integration --color -v --retry-on-error "${target}" --requirements "${COVERAGE}" \
--windows 2008-SP2 \ --windows 2008-SP2 \
--windows 2008-R2_SP1 \ --windows 2008-R2_SP1 \
--windows 2012-RTM \ --windows 2012-RTM \
@ -34,6 +34,6 @@ else
target="windows/ci/group${job}/" target="windows/ci/group${job}/"
ansible-test windows-integration --color -v --retry-on-error "${target}" --requirements \ ansible-test windows-integration --color -v --retry-on-error "${target}" --requirements "${COVERAGE}" \
--windows 2012-R2_RTM --windows 2012-R2_RTM
fi fi