From e2c392ae1ef7bb73799e6f44f96929f295b3eb71 Mon Sep 17 00:00:00 2001
From: Anoop C S <anoopcs@cryptolab.net>
Date: Wed, 22 Nov 2023 20:46:03 +0530
Subject: [PATCH] client-test: Disable printing test output

* smbtorture tests have been configured[1] to print the results
  irrespective of the outcome.
* Test output is now redirected to a separate file[2], additional
  debug lines from ansible are no longer required.

Previous change from 15b8f6179f204c4ee3cce755e7fcc4498e0fe9d3 to
configure ANSIBLE_STDOUT_CALLBACK option can also be avoided as
entire results are now available in a separate file.

[1] https://github.com/samba-in-kubernetes/sit-test-cases/pull/44
[2] https://github.com/samba-in-kubernetes/sit-environment/pull/67

Signed-off-by: Anoop C S <anoopcs@cryptolab.net>
---
 playbooks/ansible/Makefile                     |  2 +-
 .../roles/test.sit-test-cases/tasks/main.yml   | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

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