aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilosz Wasilewski <milosz.wasilewski@linaro.org>2014-03-20 11:01:29 +0000
committerMilosz Wasilewski <milosz.wasilewski@linaro.org>2014-03-20 11:01:29 +0000
commit03094b9deb2137536cebeb91d0e0a21737aaaf6a (patch)
tree34f38d7245d8e4ce88d86323a9e41dede8ecd3ce
parent48de60439b3900005224a2f0ac960a756cdf017b (diff)
finish signal is now parametrized to make sure correct shells on host and target work together
-rw-r--r--wa2host.yaml3
-rw-r--r--wa2multi.json25
-rw-r--r--wa2target.yaml5
3 files changed, 23 insertions, 10 deletions
diff --git a/wa2host.yaml b/wa2host.yaml
index 395ece4..d9b2ba7 100644
--- a/wa2host.yaml
+++ b/wa2host.yaml
@@ -15,6 +15,7 @@ params:
AGENDA: "hmp_audio.yaml"
JOB_NAME: "workload-automation"
MODE: "mp"
+ FINISH_SIGNAL: "workload-finished"
run:
steps:
@@ -28,4 +29,4 @@ run:
- 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
- - lava-test-case step11-multinode-sync --shell lava-sync workload-finished
+ - lava-test-case step11-multinode-sync --shell lava-sync $FINISH_SIGNAL
diff --git a/wa2multi.json b/wa2multi.json
index 2981e8e..a5b8bb6 100644
--- a/wa2multi.json
+++ b/wa2multi.json
@@ -25,14 +25,14 @@
{
"command": "deploy_linaro_android_image",
"metadata": {
- "android.build": "202",
+ "android.build": "207",
"android.name": "linaro-android-vexpress-lsk",
"android.url": "https://android-build.linaro.org/builds/~linaro-android/vexpress-lsk/"
},
"parameters": {
- "boot": "http://snapshots.linaro.org/android/~linaro-android/vexpress-lsk/202/boot.tar.bz2",
- "data": "http://snapshots.linaro.org/android/~linaro-android/vexpress-lsk/202/userdata.tar.bz2",
- "system": "http://snapshots.linaro.org/android/~linaro-android/vexpress-lsk/202/system.tar.bz2",
+ "boot": "http://snapshots.linaro.org/android/~linaro-android/vexpress-lsk/207/boot.tar.bz2",
+ "data": "http://snapshots.linaro.org/android/~linaro-android/vexpress-lsk/207/userdata.tar.bz2",
+ "system": "http://snapshots.linaro.org/android/~linaro-android/vexpress-lsk/207/system.tar.bz2",
"role": "target"
}
},
@@ -46,7 +46,8 @@
"parameters": {
"AGENDA": "hmp_audio.yaml",
"JOB_NAME": "hmp_multinode_experiment1",
- "MODE": "mp"
+ "MODE": "mp",
+ "FINISH_SIGNAL": "hmp_audio_iter1_finished"
}
}
],
@@ -60,7 +61,11 @@
"testdef_repos": [
{
"git-repo": "git://git.linaro.org/people/milosz.wasilewski/wa2-lava.git",
- "testdef": "wa2target.yaml"
+ "testdef": "wa2target.yaml",
+ "parameters": {
+ "FINISH_SIGNAL": "hmp_audio_iter1_finished"
+ }
+
}
],
"timeout": 2400,
@@ -77,7 +82,8 @@
"parameters": {
"AGENDA": "hmp_audio.yaml",
"JOB_NAME": "hmp_multinode_experiment1",
- "MODE": "mp"
+ "MODE": "mp",
+ "FINISH_SIGNAL": "hmp_audio_iter2_finished"
}
}
],
@@ -91,7 +97,10 @@
"testdef_repos": [
{
"git-repo": "git://git.linaro.org/people/milosz.wasilewski/wa2-lava.git",
- "testdef": "wa2target.yaml"
+ "testdef": "wa2target.yaml",
+ "parameters": {
+ "FINISH_SIGNAL": "hmp_audio_iter2_finished"
+ }
}
],
"timeout": 2400,
diff --git a/wa2target.yaml b/wa2target.yaml
index 2e7fc11..31a92b4 100644
--- a/wa2target.yaml
+++ b/wa2target.yaml
@@ -11,6 +11,9 @@ metadata:
devices:
- vexpress-tc2
+params:
+ FINISH_SIGNAL: "workload-finished"
+
run:
steps:
- lava-test-case step1-cat-build-info --shell cat /system/build.prop
@@ -19,5 +22,5 @@ run:
- 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 send-ip ipaddr=$(getprop dhcp.eth0.ipaddress)
- - lava-test-case step7-multinode-sync --shell lava-sync workload-finished
+ - lava-test-case step7-multinode-sync --shell lava-sync $FINISH_SIGNAL