prevent directory conflict with the unpacked netperf directory.

9 files changed, 71 insertions, 7 deletions

diff --git a/netperf-defs/beagleblack-netperf-group.json b/netperf-defs/beagleblack-netperf-group.json
new file mode 100644
index 0000000..4f745d8
--- /dev/null
+++ b/netperf-defs/beagleblack-netperf-group.json
@@ -0,0 +1,64 @@
+{
+    "timeout": 900,
+    "job_name": "netperf beagleblack tests",
+    "logging_level": "DEBUG",
+    "device_group": [
+        {
+            "role": "client",
+            "count": 1,
+            "device_type": "beaglebone-black",
+            "tags": [
+                "test-client"
+            ]
+        },
+        {
+            "role": "server",
+            "count": 1,
+            "device_type": "beaglebone-black",
+            "tags": [
+                "test-server"
+            ]
+        }
+    ],
+    "actions": [
+        {
+            "command": "deploy_linaro_image",
+            "parameters": {
+                "image": "http://linaro-gateway/beaglebone/beaglebone_20130625-379.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/imx53-netperf-group.json b/netperf-defs/imx53-netperf-group.json
index 071b705..c92681d 100644
--- a/netperf/imx53-netperf-group.json
+++ b/netperf-defs/imx53-netperf-group.json
@@ -6,7 +6,7 @@
         {
             "role": "client",
             "count": 1,
-            "device_type": "panda",
+            "device_type": "mx53loco",
             "tags": [
                 "test-client"
             ]
@@ -14,7 +14,7 @@
         {
             "role": "server",
             "count": 1,
-            "device_type": "panda",
+            "device_type": "mx53loco",
             "tags": [
                 "test-server"
             ]
@@ -32,8 +32,8 @@
             "parameters": {
                 "testdef_repos": [
                     {
-                        "git-repo": "git://git.linaro.org/people/guoqing.zhu/netperf-multinode.git",
-                        "testdef": "netperf/netperf-multinode-c-network.yaml"
+                        "git-repo": "git://git.linaro.org/people/neilwilliams/multinode-yaml.git",
+                        "testdef": "netperf-defs/netperf-multinode-c-network.yaml"
                     }
                 ],
                 "timeout": 1800,
@@ -45,8 +45,8 @@
             "parameters": {
                 "testdef_repos": [
                     {
-                        "git-repo": "git://git.linaro.org/people/guoqing.zhu/netperf-multinode.git",
-                        "testdef": "netperf/netperf-multinode-s-network.yaml"
+                        "git-repo": "git://git.linaro.org/people/neilwilliams/multinode-yaml.git",
+                        "testdef": "netperf-defs/netperf-multinode-s-network.yaml"
                     }
                 ],
                 "timeout": 1800,
@@ -56,7 +56,7 @@
         {
             "command": "submit_results_on_host",
             "parameters": {
-                "stream": "/anonymous/codehelp/",
+                "stream": "/anonymous/instance-manager/",
                 "server": "http://multinode.validation.linaro.org/RPC2/"
             }
         }
diff --git a/netperf/netperf-client-napi.sh b/netperf-defs/netperf-client-napi.sh
index ebf9b8a..ebf9b8a 100755
--- a/netperf/netperf-client-napi.sh
+++ b/netperf-defs/netperf-client-napi.sh
diff --git a/netperf/netperf-client.sh b/netperf-defs/netperf-client.sh
index 7fd2fe3..7fd2fe3 100755
--- a/netperf/netperf-client.sh
+++ b/netperf-defs/netperf-client.sh
diff --git a/netperf/netperf-multinode-c-network.yaml b/netperf-defs/netperf-multinode-c-network.yaml
index 6b94d07..6b94d07 100644
--- a/netperf/netperf-multinode-c-network.yaml
+++ b/netperf-defs/netperf-multinode-c-network.yaml
diff --git a/netperf/netperf-multinode-s-network.yaml b/netperf-defs/netperf-multinode-s-network.yaml
index e6d90f4..e6d90f4 100644
--- a/netperf/netperf-multinode-s-network.yaml
+++ b/netperf-defs/netperf-multinode-s-network.yaml
diff --git a/netperf/netperf-server.sh b/netperf-defs/netperf-server.sh
index b3684be..b3684be 100755
--- a/netperf/netperf-server.sh
+++ b/netperf-defs/netperf-server.sh
diff --git a/netperf/netperf2LAVA.py b/netperf-defs/netperf2LAVA.py
index ce47012..ce47012 100755
--- a/netperf/netperf2LAVA.py
+++ b/netperf-defs/netperf2LAVA.py
diff --git a/netperf/singlenode-network.yaml b/netperf-defs/singlenode-network.yaml
index 45d529f..45d529f 100644
--- a/netperf/singlenode-network.yaml
+++ b/netperf-defs/singlenode-network.yaml