diff options
| author | Matt Clay <matt@mystile.com> | 2020-12-02 21:05:30 +0100 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2020-12-02 22:40:01 +0100 |
| commit | 3a633b278dcbf309d3e24c8a0f645922eb945ded (patch) | |
| tree | 2884d28d7f25c43f20d7ffb634a7014ee7a6138c /test/utils | |
| parent | [centos6] update container for EOL (diff) | |
| download | ansible-3a633b278dcbf309d3e24c8a0f645922eb945ded.tar.xz ansible-3a633b278dcbf309d3e24c8a0f645922eb945ded.zip | |
[devel] Azure Pipelines configuration.
Diffstat (limited to 'test/utils')
| -rwxr-xr-x | test/utils/shippable/shippable.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/utils/shippable/shippable.sh b/test/utils/shippable/shippable.sh index 55d6828971..10f32f044e 100755 --- a/test/utils/shippable/shippable.sh +++ b/test/utils/shippable/shippable.sh @@ -13,7 +13,7 @@ docker images ansible/ansible docker images quay.io/ansible/* docker ps -for container in $(docker ps --format '{{.Image}} {{.ID}}' | grep -v -e '^drydock/' -e '^quay.io/ansible/shippable-build-container:' | sed 's/^.* //'); do +for container in $(docker ps --format '{{.Image}} {{.ID}}' | grep -v -e '^drydock/' -e '^quay.io/ansible/shippable-build-container:' -e '^quay.io/ansible/azure-pipelines-test-container:' | sed 's/^.* //'); do docker rm -f "${container}" || true # ignore errors done @@ -146,7 +146,7 @@ function cleanup fi } -trap cleanup EXIT +if [ "${SHIPPABLE_BUILD_ID:-}" ]; then trap cleanup EXIT; fi if [[ "${COVERAGE:-}" == "--coverage" ]]; then timeout=60 @@ -156,5 +156,5 @@ fi ansible-test env --dump --show --timeout "${timeout}" --color -v -"test/utils/shippable/check_matrix.py" +if [ "${SHIPPABLE_BUILD_ID:-}" ]; then "test/utils/shippable/check_matrix.py"; fi "test/utils/shippable/${script}.sh" "${test}" |