diff options
| author | Neil Williams <codehelp@debian.org> | 2013-08-22 08:43:52 +0100 |
|---|---|---|
| committer | Neil Williams <codehelp@debian.org> | 2013-08-22 08:43:52 +0100 |
| commit | 73b94a4aa29f580db4d2c758763901da8528558c (patch) | |
| tree | 0cc895909f669777bdb3f6da88ae3f2c82a60d7a | |
| parent | 368ab181540a367675295825025d60a6c0153a51 (diff) | |
Allow mkdir to fail and package the server script.
| -rw-r--r-- | netperf/netperf-multinode-s-network.yaml | 4 | ||||
| -rwxr-xr-x | netperf/netperf-server.sh | 17 |
2 files changed, 19 insertions, 2 deletions
diff --git a/netperf/netperf-multinode-s-network.yaml b/netperf/netperf-multinode-s-network.yaml index d5b734e..5ca07c3 100644 --- a/netperf/netperf-multinode-s-network.yaml +++ b/netperf/netperf-multinode-s-network.yaml @@ -5,7 +5,7 @@ metadata: install: steps: - - 'mkdir netperf' + - 'mkdir netperf || true' - 'cd netperf' - 'curl ftp://ftp.netperf.org/netperf/netperf-2.6.0.tar.gz > netperf-2.6.0.tar.gz' - 'tar --strip-components=1 -zxf netperf-2.6.0.tar.gz' @@ -30,6 +30,6 @@ run: - route - lava-network broadcast eth0 - lava-network collect eth0 - - lava-test-case multinode-lava-network --shell ./netperf-server.sh + - lava-test-case multinode-lava-network --shell ./netperf/netperf-server.sh - lava-sync ready - lava-sync done diff --git a/netperf/netperf-server.sh b/netperf/netperf-server.sh new file mode 100755 index 0000000..b3684be --- /dev/null +++ b/netperf/netperf-server.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +set -x + +#local_ip=$(ifconfig|grep "inet addr"|grep -v "127.0.0.1"|cut -d: -f2|cut -d' ' -f1) + +#echo "local ip:"${local_ip} +#for line in `grep ":ip=" /tmp/lava_multi_node_cache.txt |cut -d'=' -f2` ; do +# if [ "${local_ip}" != "${line}" ]; then +# remote_ip=${line} +# echo "remote ip:"${remote_ip} +# fi +#done + +cd netperf/build/bin + +./netserver && echo 'test_case_id:netserver units:none measurement:0 result:pass' || echo 'test_case_id:netserver units:none measurement:0 result:fail' |