summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Williams <codehelp@debian.org>2013-08-23 16:29:26 +0100
committerNeil Williams <codehelp@debian.org>2013-08-23 16:29:26 +0100
commitf845214800e279221d6bd362fe2dc9357c8b7ec2 (patch)
treecb101e8842cf1d314686d35fa7317b4e7da25f09
parent489fee0e770caab6052db4615d3a5ffd9b6407a5 (diff)
fix typo in location of netperf-server.sh
-rw-r--r--netperf-defs/kvm-netperf-group.json64
-rw-r--r--netperf-defs/netperf-multinode-c-network.yaml2
2 files changed, 65 insertions, 1 deletions
diff --git a/netperf-defs/kvm-netperf-group.json b/netperf-defs/kvm-netperf-group.json
new file mode 100644
index 0000000..daf40f5
--- /dev/null
+++ b/netperf-defs/kvm-netperf-group.json
@@ -0,0 +1,64 @@
+{
+ "timeout": 900,
+ "job_name": "netperf kvm tests",
+ "logging_level": "DEBUG",
+ "device_group": [
+ {
+ "role": "client",
+ "count": 1,
+ "device_type": "kvm",
+ "tags": [
+ "test-client"
+ ]
+ },
+ {
+ "role": "server",
+ "count": 1,
+ "device_type": "kvm",
+ "tags": [
+ "test-server"
+ ]
+ }
+ ],
+ "actions": [
+ {
+ "command": "deploy_linaro_image",
+ "parameters": {
+ "image": "http://images.validation.linaro.org/kvm-debian-wheezy.img.gz"
+ }
+ },
+ {
+ "command": "lava_test_shell",
+ "parameters": {
+ "testdef_repos": [
+ {
+ "git-repo": "git://git.linaro.org/people/neilwilliams/multinode-yaml.git",
+ "testdef": "netperf-defs/netperf-multinode-c-network.yaml"
+ }
+ ],
+ "timeout": 1800,
+ "role": "client"
+ }
+ },
+ {
+ "command": "lava_test_shell",
+ "parameters": {
+ "testdef_repos": [
+ {
+ "git-repo": "git://git.linaro.org/people/neilwilliams/multinode-yaml.git",
+ "testdef": "netperf-defs/netperf-multinode-s-network.yaml"
+ }
+ ],
+ "timeout": 1800,
+ "role": "server"
+ }
+ },
+ {
+ "command": "submit_results_on_host",
+ "parameters": {
+ "stream": "/anonymous/codehelp/",
+ "server": "http://staging.validation.linaro.org/RPC2/"
+ }
+ }
+ ]
+}
diff --git a/netperf-defs/netperf-multinode-c-network.yaml b/netperf-defs/netperf-multinode-c-network.yaml
index 6b94d07..f4903c5 100644
--- a/netperf-defs/netperf-multinode-c-network.yaml
+++ b/netperf-defs/netperf-multinode-c-network.yaml
@@ -31,7 +31,7 @@ run:
- lava-network broadcast eth0
- lava-network collect eth0
- lava-sync ready
- - lava-test-case multinode-lava-network --shell ./netperf/netperf-client-napi.sh
+ - lava-test-case multinode-lava-network --shell ./netperf-defs/netperf-client-napi.sh
- lava-sync done
parse: