diff --git a/playbooks/ansible/Makefile b/playbooks/ansible/Makefile index db6925b0..42722088 100644 --- a/playbooks/ansible/Makefile +++ b/playbooks/ansible/Makefile @@ -17,7 +17,7 @@ generate.report: @ansible-playbook -i $(INVENTORY) ${ANSIBLE_EXTRA_VARS} ./generate-report.yml client.test: - @ANSIBLE_STDOUT_CALLBACK=debug ansible-playbook -i $(INVENTORY) ${ANSIBLE_EXTRA_VARS} ./client-test.yml + @ansible-playbook -i $(INVENTORY) ${ANSIBLE_EXTRA_VARS} ./client-test.yml setup.site: setup.cluster setup.clients client.test diff --git a/playbooks/ansible/roles/test.sit-test-cases/tasks/main.yml b/playbooks/ansible/roles/test.sit-test-cases/tasks/main.yml index 9af46ea7..1abd8997 100644 --- a/playbooks/ansible/roles/test.sit-test-cases/tasks/main.yml +++ b/playbooks/ansible/roles/test.sit-test-cases/tasks/main.yml @@ -1,18 +1,12 @@ --- - name: Run tests - block: - - shell: - chdir: /root/sit-test-cases - cmd: make test &> /var/log/test.out - register: test_output - - debug: var=test_output.stdout_lines + shell: + chdir: /root/sit-test-cases + cmd: make test &> /var/log/test.out when: test_sanity_only is undefined - name: Run sanity tests - block: - - shell: - chdir: /root/sit-test-cases - cmd: make sanity_test &> /var/log/test.out - register: test_output - - debug: var=test_output.stdout_lines + shell: + chdir: /root/sit-test-cases + cmd: make sanity_test &> /var/log/test.out when: test_sanity_only is defined