Move conf to *_run.sh

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

diff --git a/tct/artik_prepare_flash_conf.sh b/tct/artik_prepare_flash_conf.sh
index 40c6169..7fecf9e 100755 (executable)
--- a/tct/artik_prepare_flash_conf.sh
+++ b/tct/artik_prepare_flash_conf.sh
@@ -44,7 +44,6 @@ esac
 
 . "${TESTLAB_SCRIPTS}/prepare/prepare.sh"
 . "${TESTLAB_SCRIPTS}/flash/flash.sh"
-. "${TESTLAB_SCRIPTS}/conf/conf.sh"
 
 echo "### prepare ###"
 
@@ -86,17 +85,6 @@ switch2device "${SDMUX}"
 restart_device "${SDMUX}" "${ARTIK_RESTART_SLEEP}"
 dyper_restart "${SDMUX}" "dyper1"
 
-echo "### conf ###"
-
-CONNECT_CNT="$(wait_sdb "${SDMUX}")" || die "wait_sdb: failed!"
-
-printf "\n"
-sleep 4
-
-sdb -s "${SDMUX}" root on
-
-echo "CONNECT_CNT $CONNECT_CNT" > sysctl.result
-
 echo "### cleanup ###"
 
 rm -rf "${T_DIR}"

diff --git a/tct/minnow_prepare_flash_conf.sh b/tct/minnow_prepare_flash_conf.sh
index 2db1bc2..ba4ed93 100755 (executable)
--- a/tct/minnow_prepare_flash_conf.sh
+++ b/tct/minnow_prepare_flash_conf.sh
@@ -18,7 +18,6 @@
 # Compatibile with both (32-bit and 64-bit) versions.
 # Configuration file in $TL_IP_CONF is required; format is:
 #   <IP address> <SDMUX>
-# It leaves CONNECT_CNT in sysctl.result to be later used by minnow_run.sh
 #
 # Synatx is: minnow_prepare_conf_flash.sh $SDMUX $IMAGE
 #
@@ -28,7 +27,6 @@ export TESTLAB_SCRIPTS="$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd -P)"
 
 . "${TESTLAB_SCRIPTS}/common.sh"
 . "${TESTLAB_SCRIPTS}/flash/flash.sh"
-. "${TESTLAB_SCRIPTS}/conf/conf.sh"
 
 SDMUX="$1"
 IMAGE="$2"
@@ -63,10 +61,3 @@ if [ $RET -ne 0 ]; then
 fi
 switch2device "${SDMUX}"
 restart_device "${SDMUX}"
-
-echo "### conf ###"
-
-CONNECT_CNT="$(wait_ssh "${SDMUX}")"
-printf "\n"
-
-echo "CONNECT_CNT $CONNECT_CNT" > sysctl.result

diff --git a/tct/minnow_run.sh b/tct/minnow_run.sh
index 781541d..f17ff05 100755 (executable)
--- a/tct/minnow_run.sh
+++ b/tct/minnow_run.sh
@@ -40,12 +40,14 @@ test -n "${SDMUX}" || die "Missing argument: sdmux!"
 
 IP="$(get_ip "${SDMUX}")" || die "Error: get_ip failed!"
 
-test -f sysctl.result && CONNECT_CNT_STR="$(cat sysctl.result)"
+echo "### conf ###"
+
+CONNECT_CNT="$(wait_ssh "${SDMUX}")"
+printf "\n"
 
 copy_ssh "${IP}" "${TESTLAB_SCRIPTS}/run/smoke_tests.sh"
 run_smoke_ssh "${IP}"
 
-test -n "$CONNECT_CNT_STR" && echo "$CONNECT_CNT_STR" >> sysctl.result
 cat sysctl.result
 
 echo "### run ###"

diff --git a/tct/odroid_prepare_flash_conf.sh b/tct/odroid_prepare_flash_conf.sh
index 615904e..ba63bef 100755 (executable)
--- a/tct/odroid_prepare_flash_conf.sh
+++ b/tct/odroid_prepare_flash_conf.sh
@@ -15,7 +15,6 @@
 # limitations under the License.
 
 # Script used to flash, prepare and configure ODROID U3
-# It leaves CONNECT_CNT in sysctl.result to be later used by odroid_run.sh
 #
 # Syntax is: odroid_prepare_conf_flash.sh $SDMUX $BOOT_IMAGE $IMAGE \
 #    [$NATIVE_TCT_REPO]
@@ -37,7 +36,6 @@ test -n "${IMAGE}" || die "Missing argument: image!"
 
 . "${TESTLAB_SCRIPTS}/prepare/prepare.sh"
 . "${TESTLAB_SCRIPTS}/flash/flash.sh"
-. "${TESTLAB_SCRIPTS}/conf/conf.sh"
 
 echo "### prepare ###"
 
@@ -75,22 +73,6 @@ fi
 switch2device "${SDMUX}"
 restart_device "${SDMUX}"
 
-echo "### conf ###"
-
-CONNECT_CNT="$(wait_sdb "${SDMUX}")" || die "wait_sdb: failed!"
-
-printf "\n"
-sleep 4
-
-if [ -n "${NATIVE_TCT_REPO}" ]
-then
-    conf_device "${SDMUX}" "${NATIVE_TCT_REPO}"
-else
-    sdb -s "${SDMUX}" root on
-fi
-
-echo "CONNECT_CNT $CONNECT_CNT" > sysctl.result
-
 echo "### cleanup ###"
 
 rm -rf "${IMAGE_MOUNTPOINT}"

diff --git a/tct/odroid_run.sh b/tct/odroid_run.sh
index c76ff44..ab9e418 100755 (executable)
--- a/tct/odroid_run.sh
+++ b/tct/odroid_run.sh
@@ -34,9 +34,16 @@ NATIVE_TCT_REPO="$2"
 
 test -n "${SDMUX}" || die "Missing argument: sdmux!"
 
-echo "### run ###"
+echo "### conf ###"
+
+CONNECT_CNT="$(wait_sdb "${SDMUX}")" || die "wait_sdb: failed!"
+
+printf "\n"
+sleep 4
 
-test -f sysctl.result && CONNECT_CNT_STR="$(cat sysctl.result)"
+sdb -s "${SDMUX}" root on
+
+echo "### run ###"
 
 copy_sdb "${SDMUX}" "${TESTLAB_SCRIPTS}/run/smoke_tests.sh"
 run_smoke_sdb "${SDMUX}"
@@ -53,7 +60,6 @@ then
     sdb -s "${SDMUX}" shell mount -o ro,remount /
 fi
 
-test -n "$CONNECT_CNT_STR" && echo "$CONNECT_CNT_STR" >> sysctl.result
 cat sysctl.result
 
 if [ -f "common_test.yaml" ]