WA2: update for Juno

Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>

8 files changed, 10 insertions, 9 deletions

diff --git a/postprocessing.py b/postprocessing.py
index 713e0b3..60adcab 100755
--- a/postprocessing.py
+++ b/postprocessing.py
@@ -26,7 +26,7 @@ from copy import deepcopy
 from numpy import array, mean
 from optparse import OptionParser
 
-SQLITE_DB_GLOBAL_PATH = "/root/db_results/"
+SQLITE_DB_GLOBAL_PATH = "/root/db_results_juno/"
 VALUE = 'value'
 UNIT = 'unit'
 
diff --git a/prepare-agenda.py b/prepare-agenda.py
index 061be7f..089d6fe 100755
--- a/prepare-agenda.py
+++ b/prepare-agenda.py
@@ -25,7 +25,7 @@ import yaml
 from optparse import OptionParser
 
 TEMPLATE_PATH = "templates/"
-SQLITE_DB_GLOBAL_PATH = "/root/db_results/"
+SQLITE_DB_GLOBAL_PATH = "/root/db_results_juno/"
 SQLITE_DB = 'sqlite_database'
 CONFIG = 'config'
 
diff --git a/prepare-config.py b/prepare-config.py
index 397c7f5..29c2c2b 100755
--- a/prepare-config.py
+++ b/prepare-config.py
@@ -27,7 +27,7 @@ from string import Template
 from optparse import OptionParser
 
 TEMPLATE_PATH = "templates/"
-CONFIG_NAME = "config.py"
+CONFIG_NAME = "config-juno.py"
 CONFIG_PATH = TEMPLATE_PATH + CONFIG_NAME
 LAVA_CACHE_PATH = "/tmp/lava_multi_node_cache.txt"
 IPADDR_FILE = "IPADDR"
diff --git a/prepare-device.sh b/prepare-device.sh
index 8ff28ce..16b0e89 100755
--- a/prepare-device.sh
+++ b/prepare-device.sh
@@ -32,8 +32,8 @@ then
     echo "Waiting for device"
     adb wait-for-device
     echo "Disable A57 cluster"
-    adb -s $IPADDR:5555 shell "echo 0 > /sys/devices/system/cpu/cpu3/online"
     adb -s $IPADDR:5555 shell "echo 0 > /sys/devices/system/cpu/cpu4/online"
+    adb -s $IPADDR:5555 shell "echo 0 > /sys/devices/system/cpu/cpu5/online"
 fi
 
 if [ $1 == 'a57only' ]
@@ -47,6 +47,7 @@ then
     adb -s $IPADDR:5555 shell "echo 0 > /sys/devices/system/cpu/cpu0/online"
     adb -s $IPADDR:5555 shell "echo 0 > /sys/devices/system/cpu/cpu1/online"
     adb -s $IPADDR:5555 shell "echo 0 > /sys/devices/system/cpu/cpu2/online"
+    adb -s $IPADDR:5555 shell "echo 0 > /sys/devices/system/cpu/cpu3/online"
 fi
 
 exit 0
diff --git a/run-workload.sh b/run-workload.sh
index 405961a..8bca16e 100755
--- a/run-workload.sh
+++ b/run-workload.sh
@@ -47,5 +47,5 @@ echo -n "IKS enabled: "
 adb -s $IPADDR:5555 shell "cat /sys/kernel/bL_switcher/active"
 echo -e "**********************\n"
 
-wa run $1 -v -f -d $2 -c config.py
+wa run $1 -v -f -d $2 -c config-juno.py
 exit 0
diff --git a/wa2host.yaml b/wa2host-juno.yaml
index 293e92f..d894af1 100644
--- a/wa2host.yaml
+++ b/wa2host-juno.yaml
@@ -14,12 +14,12 @@ metadata:
 params:
     AGENDA: "hmp_audio.yaml"
     JOB_NAME: "workload-automation"
-    MODE: "mp"
+    MODE: "hmp"
     SIGNAL_PREFIX: "workload"
 
 run:
     steps:
-        - lava-test-case step1-$SIGNAL_PREFIX-copy-templates --shell cp /root/templates/config.py templates/
+        - lava-test-case step1-$SIGNAL_PREFIX-copy-templates --shell cp /root/templates/config-juno.py templates/
         - lava-test-case step2-$SIGNAL_PREFIX-prepare-agenda --shell ./prepare-agenda.py --agenda $AGENDA --job-name $JOB_NAME
         - lava-test-case step3-$SIGNAL_PREFIX-wait-for-ip --shell lava-wait $SIGNAL_PREFIX-send-ip
         - lava-test-case step4-$SIGNAL_PREFIX-kill-adb-server --shell adb kill-server
diff --git a/wa2host_postprocessing.yaml b/wa2host_postprocessing-juno.yaml
index 1b4e5c8..34b74e6 100644
--- a/wa2host_postprocessing.yaml
+++ b/wa2host_postprocessing-juno.yaml
@@ -18,7 +18,7 @@ params:
 run:
     steps:
         - ./postprocessing.py --job-name $JOB_NAME
-        - "if [ $DELETE_DB != 'false' ]; then rm /root/db_results $JOB_NAME.db; fi"
+        - "if [ $DELETE_DB != 'false' ]; then rm /root/db_results_juno $JOB_NAME.db; fi"
 
 parse:
     pattern: "^(?P<test_case_id>\\S+)\\s+Measurement:(?P<measurement>\\d+\\.\\d+)\\s+Units:(?P<units>\\S+)\\s+Result:(?P<result>\\S+)"
diff --git a/wa2target.yaml b/wa2target-juno.yaml
index 347ee93..4f3c826 100644
--- a/wa2target.yaml
+++ b/wa2target-juno.yaml
@@ -9,7 +9,7 @@ metadata:
     scope:
         - functional
     devices:
-        - vexpress-tc2
+        - juno
 
 params:
     SIGNAL_PREFIX: "workload"