diff options
| author | James Cammarata <jimi@sngx.net> | 2015-12-21 14:09:02 -0500 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2015-12-21 14:09:02 -0500 |
| commit | 0a6bc57fa55b935bc96d64f9fbb961995a599dcd (patch) | |
| tree | 8e8347b130caae8fe783bf5099722b73438085f6 | |
| parent | 1d18964daa6b70f5f35431046c3707689ba4a994 (diff) | |
| download | ansible-0a6bc57fa55b935bc96d64f9fbb961995a599dcd.tar.gz | |
Parallelize make command for integration test runner
Also adds a new var, used by the prepare_tests role, to prevent it from
deleting the temp test directory at the start of each play to avoid any
potential race conditions
| -rw-r--r-- | test/integration/roles/prepare_tests/tasks/main.yml | 1 | ||||
| -rw-r--r-- | test/utils/ansible-playbook_integration_runner/roles/run_integration/tasks/main.yml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/test/integration/roles/prepare_tests/tasks/main.yml b/test/integration/roles/prepare_tests/tasks/main.yml index 3641880baa..7983ea5236 100644 --- a/test/integration/roles/prepare_tests/tasks/main.yml +++ b/test/integration/roles/prepare_tests/tasks/main.yml @@ -22,6 +22,7 @@ always_run: True tags: - prepare + when: clean_working_dir|default("yes")|bool - name: create the test directory file: name={{output_dir}} state=directory diff --git a/test/utils/ansible-playbook_integration_runner/roles/run_integration/tasks/main.yml b/test/utils/ansible-playbook_integration_runner/roles/run_integration/tasks/main.yml index f67f088246..8a306a8ada 100644 --- a/test/utils/ansible-playbook_integration_runner/roles/run_integration/tasks/main.yml +++ b/test/utils/ansible-playbook_integration_runner/roles/run_integration/tasks/main.yml @@ -9,7 +9,7 @@ shell: "cd ~/ansible && pwd" register: results -- shell: "ls -la && . hacking/env-setup && cd test/integration && make {{ run_integration_make_target }}" +- shell: "ls -la && . hacking/env-setup && cd test/integration && TEST_FLAGS='-e clean_working_dir=no' make -j4 {{ run_integration_make_target }}" args: chdir: "{{ results.stdout }}" async: 3600 |