Fix arndale image to a hwpack which uses a reliable MAC address.

4 files changed, 152 insertions, 7 deletions

diff --git a/json/arndale-single-node.json b/json/arndale-single-node.json
index 49503f0..50c9865 100644
--- a/json/arndale-single-node.json
+++ b/json/arndale-single-node.json
@@ -8,7 +8,13 @@
         {
             "command": "deploy_linaro_image",
             "parameters": {
-                "image": "http://releases.linaro.org/13.03/ubuntu/arndale/arndale-quantal_server_20130324-276.img.gz"
+                "hwpack": "http://snapshots.linaro.org/kernel-hwpack/linux-preempt-rt-arndale/28/hwpack_linaro-arndale_20130723-1644_b28_armhf_supported.tar.gz",
+                "rootfs": "http://snapshots.linaro.org/ubuntu/images/nano-lava/442/linaro-raring-nano-lava-20130725-442.tar.gz"
+            },
+            "metadata": {
+                "distribution": "ubuntu",
+                "hwpack.type": "arndale",
+                "rootfs.type": "nano-lava"
             }
         },
         {
diff --git a/json/panda-arndale-group.json b/json/panda-arndale-group.json
index a02e9b7..5dd10ae 100644
--- a/json/panda-arndale-group.json
+++ b/json/panda-arndale-group.json
@@ -1,6 +1,6 @@
 {
     "timeout": 900,
-    "job_name": "codehelp multinode API tests",
+    "job_name": "ch mn panda arndale tests",
     "logging_level": "DEBUG",
     "device_group": [
         {
@@ -31,8 +31,14 @@
         {
             "command": "deploy_linaro_image",
             "parameters": {
-                "image": "file:///home/codehelp/images/arndale-raring_server_20130526-344.img.gz",
+                "hwpack": "http://snapshots.linaro.org/kernel-hwpack/linux-preempt-rt-arndale/28/hwpack_linaro-arndale_20130723-1644_b28_armhf_supported.tar.gz",
+                "rootfs": "http://snapshots.linaro.org/ubuntu/images/nano-lava/442/linaro-raring-nano-lava-20130725-442.tar.gz",
                 "role": "public"
+            },
+            "metadata": {
+                "distribution": "ubuntu",
+                "hwpack.type": "arndale",
+                "rootfs.type": "nano-lava"
             }
         },
         {
@@ -41,9 +47,23 @@
                 "testdef_repos": [
                     {
                         "git-repo": "git://git.linaro.org/people/neilwilliams/multinode-yaml.git",
-                        "testdef": "group-tests-multinode.yaml"
+                        "testdef": "multinode02.yaml"
                     }
                 ],
+                "role": "public",
+                "timeout": 1800
+            }
+        },
+        {
+            "command": "lava_test_shell",
+            "parameters": {
+                "testdef_repos": [
+                    {
+                        "git-repo": "git://git.linaro.org/people/neilwilliams/multinode-yaml.git",
+                        "testdef": "multinode03.yaml"
+                    }
+                ],
+                "role": "police",
                 "timeout": 1800
             }
         },
diff --git a/json/panda-arndale-mx53-black-xmgroup.json b/json/panda-arndale-mx53-black-xmgroup.json
new file mode 100644
index 0000000..fa85d8c
--- /dev/null
+++ b/json/panda-arndale-mx53-black-xmgroup.json
@@ -0,0 +1,113 @@
+{
+    "timeout": 900,
+    "job_name": "codehelp multinode API tests",
+    "logging_level": "INFO",
+    "device_group": [
+        {
+            "role": "police",
+            "count": 2,
+            "device_type": "panda",
+            "tags": [
+                "codehelp-cop"
+            ]
+        },
+        {
+            "role": "public",
+            "count": 2,
+            "device_type": "arndale",
+            "tags": [
+                "codehelp-public"
+            ]
+        },
+        {
+            "role": "colour",
+            "count": 2,
+            "device_type": "beaglebone-black",
+            "tags": [
+                "codehelp-black"
+            ]
+        },
+        {
+            "role": "dog",
+            "count": 1,
+            "device_type": "beagle-xm",
+            "tags": [
+                "codehelp-beaglexm"
+            ]
+        },
+        {
+            "role": "mazda",
+            "count": 4,
+            "device_type": "mx53loco",
+            "tags": [
+                "codehelp-public"
+            ]
+        }
+    ],
+    "actions": [
+        {
+            "command": "deploy_linaro_image",
+            "parameters": {
+                "image": "file:///home/codehelp/images/panda-quantal_developer_20130328-278.img.gz",
+                "role": "police"
+            }
+        },
+        {
+            "command": "deploy_linaro_image",
+            "parameters": {
+                "hwpack": "http://snapshots.linaro.org/kernel-hwpack/linux-preempt-rt-arndale/28/hwpack_linaro-arndale_20130723-1644_b28_armhf_supported.tar.gz",
+                "rootfs": "http://snapshots.linaro.org/ubuntu/images/nano-lava/442/linaro-raring-nano-lava-20130725-442.tar.gz",
+                "role": "public"
+            },
+            "metadata": {
+                "distribution": "ubuntu",
+                "hwpack.type": "arndale",
+                "rootfs.type": "nano-lava"
+            }
+        },
+        {
+            "command": "deploy_linaro_image",
+            "parameters": {
+                "image": "file:///home/codehelp/images/mx53loco-ubuntu-desktop.img.gz",
+                "role": "mazda"
+            }
+        },
+        {
+            "command": "deploy_linaro_image",
+            "parameters": {
+                "image": "http://releases.linaro.org/12.02/ubuntu/beagleboard/beagle-ubuntu-desktop.img.gz",
+                "role": "dog"
+            }
+        },
+        {
+            "command": "deploy_linaro_image",
+            "parameters": {
+                "image": "http://linaro-gateway/beaglebone/beaglebone_20130625-379.img.gz",
+                "role": "colour"
+            }
+        },
+        {
+            "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": "multinode03.yaml"
+                    }
+                ],
+                "timeout": 900
+            }
+        },
+        {
+            "command": "submit_results_on_host",
+            "parameters": {
+                "stream": "/anonymous/instance-manager/",
+                "server": "http://localhost/RPC2/"
+            }
+        }
+    ]
+}
diff --git a/json/panda-arndale-mx53-group.json b/json/panda-arndale-mx53-group.json
index f1d332c..a1f211a 100644
--- a/json/panda-arndale-mx53-group.json
+++ b/json/panda-arndale-mx53-group.json
@@ -1,5 +1,5 @@
 {
-    "timeout": 18000,
+    "timeout": 900,
     "job_name": "codehelp multinode API tests",
     "logging_level": "INFO",
     "device_group": [
@@ -13,7 +13,7 @@
         },
         {
             "role": "public",
-            "count": 1,
+            "count": 2,
             "device_type": "arndale",
             "tags": [
                 "codehelp-public"
@@ -39,8 +39,14 @@
         {
             "command": "deploy_linaro_image",
             "parameters": {
-                "image": "file:///home/codehelp/images/arndale-raring_server_20130526-344.img.gz",
+                "hwpack": "http://snapshots.linaro.org/kernel-hwpack/linux-preempt-rt-arndale/28/hwpack_linaro-arndale_20130723-1644_b28_armhf_supported.tar.gz",
+                "rootfs": "http://snapshots.linaro.org/ubuntu/images/nano-lava/442/linaro-raring-nano-lava-20130725-442.tar.gz",
                 "role": "public"
+            },
+            "metadata": {
+                "distribution": "ubuntu",
+                "hwpack.type": "arndale",
+                "rootfs.type": "nano-lava"
             }
         },
         {