added prefix to step names

4 files changed, 39 insertions, 34 deletions

diff --git a/prepare-device.sh b/prepare-device.sh
index b816dfe..788461e 100755
--- a/prepare-device.sh
+++ b/prepare-device.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+set -e
 echo "Preparing device for mode: $1"
 
 if [ $1 == 'mp' ]
@@ -8,6 +9,8 @@ then
     IPADDR=`cat IPADDR`
     echo "Disable IKS for $IPADDR"
     adb connect $IPADDR:5555
+    adb devices
+    echo "adb -s $IPADDR:5555 shell \"echo 0 > /sys/kernel/bL_switcher/active\""
     adb -s $IPADDR:5555 shell "echo 0 > /sys/kernel/bL_switcher/active"
 fi
 
@@ -17,6 +20,8 @@ then
     IPADDR=`cat IPADDR`
     echo "Enable IKS for $IPADDR"
     adb connect $IPADDR:5555
+    adb devices
+    echo "adb -s $IPADDR:5555 shell \"echo 1 > /sys/kernel/bL_switcher/active\""
     adb -s $IPADDR:5555 shell "echo 1 > /sys/kernel/bL_switcher/active"
 fi
 
diff --git a/run-workload.sh b/run-workload.sh
index 2787082..6c758a9 100755
--- a/run-workload.sh
+++ b/run-workload.sh
@@ -1,25 +1,25 @@
 #!/bin/bash
 
-echo "PWD"
-echo "**********************\n"
+echo -e "PWD"
+echo -e "**********************\n"
 pwd
-echo "**********************\n"
-echo "Directory contents"
-echo "**********************\n"
+echo -e "**********************\n"
+echo -e "Directory contents"
+echo -e "**********************\n"
 ls -la
-echo "**********************\n"
-echo "config.py"
-echo "**********************\n"
-cat config.py
-echo "**********************\n"
-echo "Agenda"
-echo "**********************\n"
+echo -e "**********************\n"
+#echo -e "config.py"
+#echo -e "**********************\n"
+#cat config.py
+#echo -e "**********************\n"
+echo -e "Agenda"
+echo -e "**********************\n"
 cat $1
-echo "**********************\n"
-echo "LAVA multinode cache"
-echo "**********************\n"
+echo -e "**********************\n"
+echo -e "LAVA multinode cache"
+echo -e "**********************\n"
 cat /tmp/lava_multi_node_cache.txt | true
-echo "**********************\n"
+echo -e "**********************\n"
 
 run_workloads $1 -v -f -d $2 -c config.py
 exit 0
diff --git a/wa2host.yaml b/wa2host.yaml
index e54846f..274816b 100644
--- a/wa2host.yaml
+++ b/wa2host.yaml
@@ -19,14 +19,14 @@ params:
 
 run:
     steps:
-        - lava-test-case step1-mkdir-templates --shell mkdir templates
-        - lava-test-case step2-copy-templates --shell cp /root/templates/* templates/
-        - lava-test-case step3-prepare-agenda --shell ./prepare-agenda.py --agenda $AGENDA --job-name $JOB_NAME
-        - lava-test-case step4-wait-for-ip --shell lava-wait $SIGNAL_PREFIX-send-ip
-        - lava-test-case step5-kill-adb-server --shell adb kill-server
-        - lava-test-case step6-start-adb-server --shell adb start-server
-        - lava-test-case step7-prepare-config --shell ./prepare-config.py --prefix $SIGNAL_PREFIX
-        - lava-test-case step8-prepare-device --shell ./prepare-device.sh $MODE
-        - lava-test-case step9-run-workload --shell ./run-workload.sh $AGENDA $JOB_NAME
-        - lava-test-case step10-tear-down --shell ./tear-down.sh $JOB_NAME
-        - lava-test-case step11-multinode-sync --shell lava-sync $SIGNAL_PREFIX-finished
+        - lava-test-case step1-$SIGNAL_PREFIX-mkdir-templates --shell mkdir templates
+        - lava-test-case step2-$SIGNAL_PREFIX-copy-templates --shell cp /root/templates/* templates/
+        - lava-test-case step3-$SIGNAL_PREFIX-prepare-agenda --shell ./prepare-agenda.py --agenda $AGENDA --job-name $JOB_NAME
+        - lava-test-case step4-$SIGNAL_PREFIX-wait-for-ip --shell lava-wait $SIGNAL_PREFIX-send-ip
+        - lava-test-case step5-$SIGNAL_PREFIX-kill-adb-server --shell adb kill-server
+        - lava-test-case step6-$SIGNAL_PREFIX-start-adb-server --shell adb start-server
+        - lava-test-case step7-$SIGNAL_PREFIX-prepare-config --shell ./prepare-config.py --prefix $SIGNAL_PREFIX
+        - lava-test-case step8-$SIGNAL_PREFIX-prepare-device --shell ./prepare-device.sh $MODE
+        - lava-test-case step9-$SIGNAL_PREFIX-run-workload --shell ./run-workload.sh $AGENDA $JOB_NAME
+        - lava-test-case step10-$SIGNAL_PREFIX-tear-down --shell ./tear-down.sh $JOB_NAME
+        - lava-test-case step11-$SIGNAL_PREFIX-multinode-sync --shell lava-sync $SIGNAL_PREFIX-finished
diff --git a/wa2target.yaml b/wa2target.yaml
index a6d28f2..347ee93 100644
--- a/wa2target.yaml
+++ b/wa2target.yaml
@@ -16,11 +16,11 @@ params:
 
 run:
     steps:
-        - lava-test-case step1-cat-build-info --shell cat /system/build.prop
-        - lava-test-case step2-get-adb --shell getprop service.adb.tcp.port
-        - lava-test-case step3-set-adb --shell setprop service.adb.tcp.port 5555
-        - lava-test-case step4-stop-adbd --shell stop adbd
-        - lava-test-case step5-start-adbd --shell start adbd
-        - lava-test-case step6-send-ip --shell lava-send $SIGNAL_PREFIX-send-ip $SIGNAL_PREFIX-ipaddr=$(getprop dhcp.eth0.ipaddress)
-        - lava-test-case step7-multinode-sync --shell lava-sync $SIGNAL_PREFIX-finished
+        - lava-test-case step1-$SIGNAL_PREFIX-cat-build-info --shell cat /system/build.prop
+        - lava-test-case step2-$SIGNAL_PREFIX-get-adb --shell getprop service.adb.tcp.port
+        - lava-test-case step3-$SIGNAL_PREFIX-set-adb --shell setprop service.adb.tcp.port 5555
+        - lava-test-case step4-$SIGNAL_PREFIX-stop-adbd --shell stop adbd
+        - lava-test-case step5-$SIGNAL_PREFIX-start-adbd --shell start adbd
+        - lava-test-case step6-$SIGNAL_PREFIX-send-ip --shell lava-send $SIGNAL_PREFIX-send-ip $SIGNAL_PREFIX-ipaddr=$(getprop dhcp.eth0.ipaddress)
+        - lava-test-case step7-$SIGNAL_PREFIX-multinode-sync --shell lava-sync $SIGNAL_PREFIX-finished