Skip to content

Commit

Permalink
Merge pull request ansible#16112 from mattclay/fast-integration
Browse files Browse the repository at this point in the history
Split integration tests into multiple groups.
  • Loading branch information
mattclay committed Jun 4, 2016
2 parents 22d785d + 6e1e860 commit 77e82ad
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 9 deletions.
34 changes: 26 additions & 8 deletions shippable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,33 @@ matrix:
python: 3.4
- env: TEST=sanity INSTALL_DEPS=1 TOXENV=py35
python: 3.5
- env: TEST=integration IMAGE=ansible/ansible:centos6
- env: TEST=integration IMAGE=ansible/ansible:centos7
- env: TEST=integration IMAGE=ansible/ansible:fedora-rawhide
- env: TEST=integration IMAGE=ansible/ansible:fedora23
- env: TEST=integration IMAGE=ansible/ansible:opensuseleap
- env: TEST=integration IMAGE=ansible/ansible:ubuntu1204 PRIVILEGED=true
- env: TEST=integration IMAGE=ansible/ansible:ubuntu1404 PRIVILEGED=true
- env: TEST=integration IMAGE=ansible/ansible:ubuntu1604

- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:centos6
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:centos7
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:fedora-rawhide
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:fedora23
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:opensuseleap
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1204 PRIVILEGED=true
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1404 PRIVILEGED=true
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1604

- env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:centos6
- env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:centos7
- env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:fedora-rawhide
- env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:fedora23
- env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:opensuseleap
- env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:ubuntu1204 PRIVILEGED=true
- env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:ubuntu1404 PRIVILEGED=true
- env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:ubuntu1604

- env: TEST=integration TARGET=other IMAGE=ansible/ansible:centos6
- env: TEST=integration TARGET=other IMAGE=ansible/ansible:centos7
- env: TEST=integration TARGET=other IMAGE=ansible/ansible:fedora-rawhide
- env: TEST=integration TARGET=other IMAGE=ansible/ansible:fedora23
- env: TEST=integration TARGET=other IMAGE=ansible/ansible:opensuseleap
- env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1204 PRIVILEGED=true
- env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1404 PRIVILEGED=true
- env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1604
build:
ci:
- test/utils/shippable/ci.sh
Expand Down
4 changes: 3 additions & 1 deletion test/integration/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ EUID := $(shell id -u -r)

UNAME := $(shell uname | tr '[:upper:]' '[:lower:]')

all: setup test_test_infra parsing test_var_precedence unicode test_templating_settings environment test_connection non_destructive destructive includes blocks pull check_mode test_hash test_handlers test_group_by test_vault test_tags test_lookup_paths no_log test_gathering_facts test_binary_modules
all: setup other non_destructive destructive

other: test_test_infra parsing test_var_precedence unicode test_templating_settings environment test_connection includes blocks pull check_mode test_hash test_handlers test_group_by test_vault test_tags test_lookup_paths no_log test_gathering_facts test_binary_modules

test_test_infra:
# ensure fail/assert work locally and can stop execution with non-zero exit code
Expand Down

0 comments on commit 77e82ad

Please sign in to comment.