From 109f6f44fb2952db7bd0c20c6f27859a2ab2e427 Mon Sep 17 00:00:00 2001 From: Naresh Kamboju Date: Fri, 16 Jan 2015 21:08:20 +0530 Subject: WA2: update for Juno Signed-off-by: Naresh Kamboju --- postprocessing.py | 2 +- prepare-agenda.py | 2 +- prepare-config.py | 2 +- prepare-device.sh | 3 ++- run-workload.sh | 2 +- wa2host-juno.yaml | 33 +++++++++++++++++++++++++++++++++ wa2host.yaml | 33 --------------------------------- wa2host_postprocessing-juno.yaml | 24 ++++++++++++++++++++++++ wa2host_postprocessing.yaml | 24 ------------------------ wa2target-juno.yaml | 26 ++++++++++++++++++++++++++ wa2target.yaml | 26 -------------------------- 11 files changed, 89 insertions(+), 88 deletions(-) create mode 100644 wa2host-juno.yaml delete mode 100644 wa2host.yaml create mode 100644 wa2host_postprocessing-juno.yaml delete mode 100644 wa2host_postprocessing.yaml create mode 100644 wa2target-juno.yaml delete mode 100644 wa2target.yaml 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-juno.yaml b/wa2host-juno.yaml new file mode 100644 index 0000000..d894af1 --- /dev/null +++ b/wa2host-juno.yaml @@ -0,0 +1,33 @@ +metadata: + format: Lava-Test Test Definition 1.0 + name: wa2-host + description: "WAv2 - host part of multinode job" + maintainer: + - milosz.wasilewski@linaro.org + os: + - ubuntu + scope: + - functional + devices: + - kvm + +params: + AGENDA: "hmp_audio.yaml" + JOB_NAME: "workload-automation" + MODE: "hmp" + SIGNAL_PREFIX: "workload" + +run: + steps: + - 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 + - lava-test-case step5-$SIGNAL_PREFIX-start-adb-server --shell adb start-server + - lava-test-case step6-$SIGNAL_PREFIX-prepare-config --shell ./prepare-config.py --prefix $SIGNAL_PREFIX + - lava-test-case step7-$SIGNAL_PREFIX-prepare-device --shell ./prepare-device.sh $MODE + - lava-test-case step8-$SIGNAL_PREFIX-run-workload --shell ./run-workload.sh $AGENDA $JOB_NAME + - if [ -f ./$JOB_NAME/results.csv ]; then lava-test-case-attach step8-$SIGNAL_PREFIX-run-workload ./$JOB_NAME/results.csv; fi + - if [ -f ./$JOB_NAME/run.log ]; then lava-test-case-attach step8-$SIGNAL_PREFIX-run-workload ./$JOB_NAME/run.log; fi + - lava-test-case step9-$SIGNAL_PREFIX-tear-down --shell ./tear-down.sh $JOB_NAME + - lava-test-case step10-$SIGNAL_PREFIX-multinode-sync --shell lava-sync $SIGNAL_PREFIX-finished diff --git a/wa2host.yaml b/wa2host.yaml deleted file mode 100644 index 293e92f..0000000 --- a/wa2host.yaml +++ /dev/null @@ -1,33 +0,0 @@ -metadata: - format: Lava-Test Test Definition 1.0 - name: wa2-host - description: "WAv2 - host part of multinode job" - maintainer: - - milosz.wasilewski@linaro.org - os: - - ubuntu - scope: - - functional - devices: - - kvm - -params: - AGENDA: "hmp_audio.yaml" - JOB_NAME: "workload-automation" - MODE: "mp" - SIGNAL_PREFIX: "workload" - -run: - steps: - - lava-test-case step1-$SIGNAL_PREFIX-copy-templates --shell cp /root/templates/config.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 - - lava-test-case step5-$SIGNAL_PREFIX-start-adb-server --shell adb start-server - - lava-test-case step6-$SIGNAL_PREFIX-prepare-config --shell ./prepare-config.py --prefix $SIGNAL_PREFIX - - lava-test-case step7-$SIGNAL_PREFIX-prepare-device --shell ./prepare-device.sh $MODE - - lava-test-case step8-$SIGNAL_PREFIX-run-workload --shell ./run-workload.sh $AGENDA $JOB_NAME - - if [ -f ./$JOB_NAME/results.csv ]; then lava-test-case-attach step8-$SIGNAL_PREFIX-run-workload ./$JOB_NAME/results.csv; fi - - if [ -f ./$JOB_NAME/run.log ]; then lava-test-case-attach step8-$SIGNAL_PREFIX-run-workload ./$JOB_NAME/run.log; fi - - lava-test-case step9-$SIGNAL_PREFIX-tear-down --shell ./tear-down.sh $JOB_NAME - - lava-test-case step10-$SIGNAL_PREFIX-multinode-sync --shell lava-sync $SIGNAL_PREFIX-finished diff --git a/wa2host_postprocessing-juno.yaml b/wa2host_postprocessing-juno.yaml new file mode 100644 index 0000000..34b74e6 --- /dev/null +++ b/wa2host_postprocessing-juno.yaml @@ -0,0 +1,24 @@ +metadata: + format: Lava-Test Test Definition 1.0 + name: wa2-host-postprocessing + description: "WAv2 - host result postprocessing" + maintainer: + - milosz.wasilewski@linaro.org + os: + - ubuntu + scope: + - functional + devices: + - kvm + +params: + JOB_NAME: "workload-automation" + DELETE_DB: "false" + +run: + steps: + - ./postprocessing.py --job-name $JOB_NAME + - "if [ $DELETE_DB != 'false' ]; then rm /root/db_results_juno $JOB_NAME.db; fi" + +parse: + pattern: "^(?P\\S+)\\s+Measurement:(?P\\d+\\.\\d+)\\s+Units:(?P\\S+)\\s+Result:(?P\\S+)" diff --git a/wa2host_postprocessing.yaml b/wa2host_postprocessing.yaml deleted file mode 100644 index 1b4e5c8..0000000 --- a/wa2host_postprocessing.yaml +++ /dev/null @@ -1,24 +0,0 @@ -metadata: - format: Lava-Test Test Definition 1.0 - name: wa2-host-postprocessing - description: "WAv2 - host result postprocessing" - maintainer: - - milosz.wasilewski@linaro.org - os: - - ubuntu - scope: - - functional - devices: - - kvm - -params: - JOB_NAME: "workload-automation" - DELETE_DB: "false" - -run: - steps: - - ./postprocessing.py --job-name $JOB_NAME - - "if [ $DELETE_DB != 'false' ]; then rm /root/db_results $JOB_NAME.db; fi" - -parse: - pattern: "^(?P\\S+)\\s+Measurement:(?P\\d+\\.\\d+)\\s+Units:(?P\\S+)\\s+Result:(?P\\S+)" diff --git a/wa2target-juno.yaml b/wa2target-juno.yaml new file mode 100644 index 0000000..4f3c826 --- /dev/null +++ b/wa2target-juno.yaml @@ -0,0 +1,26 @@ +metadata: + format: Lava-Test Test Definition 1.0 + name: wa2-target + description: "WAv2 - target part of multinode job" + maintainer: + - milosz.wasilewski@linaro.org + os: + - ubuntu + scope: + - functional + devices: + - juno + +params: + SIGNAL_PREFIX: "workload" + +run: + steps: + - 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 + diff --git a/wa2target.yaml b/wa2target.yaml deleted file mode 100644 index 347ee93..0000000 --- a/wa2target.yaml +++ /dev/null @@ -1,26 +0,0 @@ -metadata: - format: Lava-Test Test Definition 1.0 - name: wa2-target - description: "WAv2 - target part of multinode job" - maintainer: - - milosz.wasilewski@linaro.org - os: - - ubuntu - scope: - - functional - devices: - - vexpress-tc2 - -params: - SIGNAL_PREFIX: "workload" - -run: - steps: - - 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 - -- cgit v1.2.3