try a test without the parser

2 files changed, 39 insertions, 12 deletions

diff --git a/json/netperf/beagleblack-netperf.json b/json/netperf/beagleblack-netperf.json
index af2e7c9..e17cf7f 100644
--- a/json/netperf/beagleblack-netperf.json
+++ b/json/netperf/beagleblack-netperf.json
@@ -24,15 +24,7 @@
         {
             "command": "deploy_linaro_image",
             "parameters": {
-                "image": "http://linaro-gateway/beaglebone/beaglebone_20130625-379.img.gz",
-                "role": "black"
-            }
-        },
-        {
-            "command": "deploy_linaro_image",
-            "parameters": {
-                "image": "http://linaro-gateway/beaglebone/beaglebone_20130625-379.img.gz",
-                "role": "grey"
+                "image": "http://linaro-gateway/beaglebone/beaglebone_20130625-379.img.gz"
             }
         },
         {
@@ -44,7 +36,7 @@
                         "testdef": "ubuntu/smoke-tests-basic.yaml"
                     },
                     {
-                        "git-repo": "git://git.linaro.org/people/guoqing.zhu/netperf-multinode.git",
+                        "git-repo": "git://git.linaro.org/people/neilwilliams/multinode-yaml.git",
                         "testdef": "netperf-multinode-c-network.yaml"
                     }
                 ],
@@ -61,7 +53,7 @@
                         "testdef": "ubuntu/smoke-tests-basic.yaml"
                     },
                     {
-                        "git-repo": "git://git.linaro.org/people/guoqing.zhu/netperf-multinode.git",
+                        "git-repo": "git://git.linaro.org/people/neilwilliams/multinode-yaml.git",
                         "testdef": "netperf-multinode-s-network.yaml"
                     }
                 ],
@@ -73,7 +65,7 @@
             "command": "submit_results_on_host",
             "parameters": {
                 "stream": "/anonymous/instance-manager/",
-                "server": "http://multinode.validation.linaro.org/RPC2/"
+                "server": "http://localhost/RPC2/"
             }
         }
     ]
diff --git a/netperf/netperf-multinode-s-network.yaml b/netperf/netperf-multinode-s-network.yaml
new file mode 100644
index 0000000..d94ec23
--- /dev/null
+++ b/netperf/netperf-multinode-s-network.yaml
@@ -0,0 +1,35 @@
+metadata:
+    format: Lava-Test Test Definition 1.0
+    name: netperf-multinode-server-napi
+    description: "Basic MultiNode netperf server test for Linux Linaro ubuntu Images"
+
+install:
+     steps:
+         - 'mkdir netperf'
+         - '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'
+         - 'mkdir build'
+         - './configure --prefix=$(readlink -f build)'
+         - 'make all'
+         - 'make SKIP_IDCHECK=1 install'
+         - 'cd ..'
+     deps:
+         - gzip
+         - flex
+         - bison
+         - build-essential
+         - curl
+         - wget
+
+run:
+    steps:
+        - ifconfig eth0 down
+        - dhclient -v eth0
+        - ifconfig -a
+        - route
+        - lava-network broadcast eth0
+        - lava-network collect eth0
+        - lava-test-case multinode-lava-network --shell ./netperf-server.sh
+        - lava-sync ready 
+        - lava-sync done