Do not run sshpass and sd-mux-ctrl as root

When using sshpass in a container special privileges were required.
It is no longer the case as TITS should run bare metal.

User should be member of 'plugdev' group.

Change-Id: I785c262dae9d78bc0b07759ba6e29df1fe744adc
Signed-off-by: Aleksander Mistewicz <a.mistewicz@samsung.com>

diff --git a/tct/conf/conf.sh b/tct/conf/conf.sh
index 5b1ea90..66eefd9 100755 (executable)
--- a/tct/conf/conf.sh
+++ b/tct/conf/conf.sh
@@ -61,7 +61,7 @@ copy_ssh() {
     test -n "${IP}" || die "Missing argument: ip"
     test -n "${FILE}" || die "Missing argument: file"
     COUNT=1
-    while ! sudo timeout 60 sshpass -p 'tizen' scp -F ${TESTLAB_SCRIPTS}/conf/ssh_config \
+    while ! timeout 60 sshpass -p 'tizen' scp -F ${TESTLAB_SCRIPTS}/conf/ssh_config \
         "${FILE}" "root@${IP}:/tmp/smoke.sh"
     do
         echo "SSH connection to ${IP} failed: retrying" >&2

diff --git a/tct/flash/flash.sh b/tct/flash/flash.sh
index f2aede6..a2ae2e0 100755 (executable)
--- a/tct/flash/flash.sh
+++ b/tct/flash/flash.sh
@@ -87,13 +87,13 @@ change_uuid() {
 switch2device() {
     SDMUX="$1"
     test -n "${SDMUX}" || die "Missing argument: sdmux!"
-    sudo sd-mux-ctrl -e "${SDMUX}" -d || die "Error returned by sd-mux-ctrl: switch2device failed!"
+    sd-mux-ctrl -e "${SDMUX}" -d || die "Error returned by sd-mux-ctrl: switch2device failed!"
 }
 
 switch2testserver() {
     SDMUX="$1"
     test -n "${SDMUX}" || die "Missing argument: sdmux!"
-    sudo sd-mux-ctrl -e "${SDMUX}" -s ||
+    sd-mux-ctrl -e "${SDMUX}" -s ||
         die "Error returned by sd-mux-ctrl: switch2testserver failed!"
 }
 
@@ -102,14 +102,14 @@ restart_device() {
     DELAY="$2"
     test -n "${SDMUX}" || die "Missing argument: sdmux!"
     test -n "${DELAY}" || DELAY="2000"
-    sudo sd-mux-ctrl -e "${SDMUX}" -m "${DELAY}" -c ||
+    sd-mux-ctrl -e "${SDMUX}" -m "${DELAY}" -c ||
         die "Error returned by sd-mux-ctrl: restart_device failed!"
 }
 
 sdmux_init() {
     SDMUX="$1"
     test -n "${SDMUX}" || die "Missing argument: sdmux!"
-    sudo sd-mux-ctrl -e "${SDMUX}" -t ||
+    sd-mux-ctrl -e "${SDMUX}" -t ||
         die "Error returned by sd-mux-ctrl: sdmux_init failed!"
 }
 
@@ -119,7 +119,7 @@ change_id() {
     test -n "${SDMUX}" || die "Missing argument: sdmux!"
     test -n "${NEWID}" || die "Missing argument: newid!"
     if [ "${SDMUX}" != "${NEWID}" ]; then
-        sudo sd-mux-ctrl -e "${SDMUX}" -r "${NEWID}" ||
+        sd-mux-ctrl -e "${SDMUX}" -r "${NEWID}" ||
             die "Error returned by sd-mux-ctrl: change_id failed!"
     fi
 }

diff --git a/tct/run/run.sh b/tct/run/run.sh
index 77aa81d..0cf85dc 100755 (executable)
--- a/tct/run/run.sh
+++ b/tct/run/run.sh
@@ -81,7 +81,7 @@ run_smoke_ssh() {
     IP="$1"
     test -n "${IP}" || die "Missing argument: ip"
     COUNT=1
-    while ! sudo timeout 60 sshpass -p 'tizen' ssh -F ${TESTLAB_SCRIPTS}/conf/ssh_config \
+    while ! timeout 60 sshpass -p 'tizen' ssh -F ${TESTLAB_SCRIPTS}/conf/ssh_config \
         "root@${IP}" sh "/tmp/smoke.sh" > sysctl.result
     do
         echo "SSH connection to ${IP} failed: retrying" >&2