From: Elena Gryaznova <elena.gryaznova@hpe.com>
Date: Mon, 22 Mar 2021 17:34:50 +0000 (+0300)
Subject: LU-14546 tests: set smbpasswd correctly
X-Git-Tag: 2.14.52~142
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F32%2F42132%2F3;p=fs%2Flustre-release.git

LU-14546 tests: set smbpasswd correctly

For RHEL 8.2 the smbpasswd tool requires password
confirmation.

Test-Parameters: trivial
Signed-off-by: Elena Gryaznova <elena.gryaznova@hpe.com>
HPE-bug-id: LUS-9761
Reviewed-by: Alexander Zarochentsev <alexander.zarochentsev@hpe.com>
Reviewed-by: Alexander Boyko <alexander.boyko@hpe.com>
Change-Id: I367fca4253f1b06dae220921106d321e52d10bc7
Reviewed-on: https://review.whamcloud.com/42132
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/setup-cifs.sh b/lustre/tests/setup-cifs.sh
index 9815f1e..637b33e 100644
--- a/lustre/tests/setup-cifs.sh
+++ b/lustre/tests/setup-cifs.sh
@@ -50,7 +50,9 @@ EOF"
 	do_node $smbsrv "testparm -s >$smbsmall"
 	do_node $smbsrv "testparm -s $smbsmall >$smbconf"
 
-	do_node $smbsrv "echo $smbpasswd | tee - | smbpasswd -a $smbuser -s"
+	do_node $smbsrv "echo $smbpasswd | tee - | smbpasswd -a $smbuser -s" ||
+		do_node $smbsrv "printf '$smbpasswd\n$smbpasswd\n' |\
+			tee - | smbpasswd -a $smbuser -s"
 }
 
 restore_config_smb() {