fix the singlenode jobs to be consistent between boards

5 files changed, 66 insertions, 46 deletions

diff --git a/json/arndale-single-node.json b/json/arndale-single-node.json
index e6f753f..49503f0 100644
--- a/json/arndale-single-node.json
+++ b/json/arndale-single-node.json
@@ -1,24 +1,37 @@
 {
     "health_check": false,
     "logging_level": "DEBUG",
-    "timeout": 18000,
+    "timeout": 900,
     "job_name": "arndale-single-node",
     "device_type": "arndale",
     "actions": [
         {
             "command": "deploy_linaro_image",
             "parameters": {
-                "image": "file:///home/codehelp/images/arndale-raring_server_20130526-344.img.gz"
+                "image": "http://releases.linaro.org/13.03/ubuntu/arndale/arndale-quantal_server_20130324-276.img.gz"
             }
         },
         {
-            "command": "boot_linaro_image"
+            "command": "lava_test_shell",
+            "parameters": {
+                "testdef_repos": [
+                    {
+                        "git-repo": "git://git.linaro.org/qa/test-definitions.git",
+                        "testdef": "ubuntu/smoke-tests-basic.yaml"
+                    },
+                    {
+                        "git-repo": "git://git.linaro.org/people/neilwilliams/multinode-yaml.git",
+                        "testdef": "singlenode03.yaml"
+                    }
+                ],
+                "timeout": 900
+            }
         },
         {
-            "command": "submit_results",
+            "command": "submit_results_on_host",
             "parameters": {
-                "server": "http://instance-manager@localhost/RPC2/",
-                "stream": "/anonymous/instance-manager/"
+                "stream": "/anonymous/instance-manager/",
+                "server": "http://instance-manager@multinode.validation.linaro.org/RPC2/"
             }
         }
     ]
diff --git a/json/beagleblack-single-node.json b/json/beagleblack-single-node.json
index 7ffc070..5260df5 100644
--- a/json/beagleblack-single-node.json
+++ b/json/beagleblack-single-node.json
@@ -1,7 +1,8 @@
 {
+    "health_check": false,
+    "logging_level": "DEBUG",
     "timeout": 900,
     "job_name": "beagleblack-single-node",
-    "logging_level": "DEBUG",
     "device_type": "beaglebone-black",
     "actions": [
         {
@@ -30,7 +31,7 @@
             "command": "submit_results_on_host",
             "parameters": {
                 "stream": "/anonymous/instance-manager/",
-                "server": "http://multinode.validation.linaro.org/RPC2/"
+                "server": "http://instance-manager@multinode.validation.linaro.org/RPC2/"
             }
         }
     ]
diff --git a/json/beaglexm-single-node.json b/json/beaglexm-single-node.json
index 904f17b..7cf66d4 100644
--- a/json/beaglexm-single-node.json
+++ b/json/beaglexm-single-node.json
@@ -1,7 +1,8 @@
 {
+    "health_check": false,
+    "logging_level": "DEBUG",
     "timeout": 900,
     "job_name": "beagle-single-node",
-    "logging_level": "DEBUG",
     "device_type": "beagle-xm",
     "actions": [
         {
diff --git a/json/imx53-single-node.json b/json/imx53-single-node.json
index aa39dc2..3845d94 100644
--- a/json/imx53-single-node.json
+++ b/json/imx53-single-node.json
@@ -1,35 +1,36 @@
 {
-  "timeout": 18000, 
-  "job_name": "singlenode-imx53",
-  "health_check": false,
-  "device_type": "mx53loco",
-  "actions": [
-    {
-      "command": "deploy_linaro_image", 
-      "parameters": {
-        "image": "file:///home/codehelp/images/mx53loco-ubuntu-desktop.img.gz"
-      }
-    }, 
-    {
-      "command": "boot_linaro_image"
-    }, 
-   {
-      "command": "deploy_linaro_android_image", 
-      "parameters": {
-           "data": "http://releases.linaro.org/12.01/android/leb-imx53/userdata.tar.bz2", 
-                "boot": "http://releases.linaro.org/12.01/android/leb-imx53/boot.tar.bz2", 
+    "health_check": false,
+    "logging_level": "DEBUG",
+    "timeout": 900,
+    "job_name": "singlenode-imx53",
+    "device_type": "mx53loco",
+    "actions": [
+        {
+            "command": "deploy_linaro_image",
+            "parameters": {
+                "image": "file:///home/codehelp/images/mx53loco-ubuntu-desktop.img.gz"
+            }
+        },
+        {
+            "command": "boot_linaro_image"
+        },
+        {
+            "command": "deploy_linaro_android_image",
+            "parameters": {
+                "data": "http://releases.linaro.org/12.01/android/leb-imx53/userdata.tar.bz2",
+                "boot": "http://releases.linaro.org/12.01/android/leb-imx53/boot.tar.bz2",
                 "system": "http://releases.linaro.org/12.01/android/leb-imx53/system.tar.bz2"
-      }
-    }, 
-    {
-      "command": "boot_linaro_android_image"
-    },  
-   {
-      "command": "submit_results", 
-      "parameters": {
-        "stream": "/anonymous/instance-manager/", 
-        "server": "http://localhost/RPC2/"
-      }
-    }
-  ] 
+            }
+        },
+        {
+            "command": "boot_linaro_android_image"
+        },
+        {
+            "command": "submit_results",
+            "parameters": {
+                "stream": "/anonymous/instance-manager/",
+                "server": "http://localhost/RPC2/"
+            }
+        }
+    ]
 }
diff --git a/json/panda-single-node.json b/json/panda-single-node.json
index eec2422..f403290 100644
--- a/json/panda-single-node.json
+++ b/json/panda-single-node.json
@@ -1,7 +1,8 @@
 {
-    "timeout": 18000,
-    "job_name": "panda-single-node",
+    "health_check": false,
     "logging_level": "DEBUG",
+    "timeout": 900,
+    "job_name": "panda-single-node",
     "device_type": "panda",
     "actions": [
         {
@@ -17,18 +18,21 @@
                     {
                         "git-repo": "git://git.linaro.org/qa/test-definitions.git",
                         "testdef": "ubuntu/smoke-tests-basic.yaml"
+                    },
+                    {
+                        "git-repo": "git://git.linaro.org/people/neilwilliams/multinode-yaml.git",
+                        "testdef": "singlenode03.yaml"
                     }
                 ],
-                "timeout": 180
+                "timeout": 900
             }
         },
         {
             "command": "submit_results_on_host",
             "parameters": {
                 "stream": "/anonymous/instance-manager/",
-                "server": "http://localhost/RPC2/"
+                "server": "http://instance-manager@multinode.validation.linaro.org/RPC2/"
             }
-
         }
     ]
 }