Merge lp:~asac/linaro-android-build-tools/select-lava-device-through-build-config into lp:linaro-android-build-tools

[Alexander Sack]

add support for selecting device type and even a concrete device in android build jobs.

 -> the latter is particularly interesting for running multiple benchmarks and repetitionms on the same machine!

Note: this code was not run... just developed dry. Please try out and fix potential syntax etc. and ping me when you are unhappy as I might not see the email :)...

[Andy Doan (doanac)]

might want to update:

 https://wiki.linaro.org/Platform/Android/AndroidBuild-LavaIntegration

once the code is merged

[Michael Hudson-Doyle (mwhudson)]

+ config_json["device"] = test_device

This needs to be config_json["target"] (yay consistency)

[Alexander Sack (asac)]

repushed with michaels fix

[lp:~asac/linaro-android-build-tools/select-lava-device-through-build-config]

465. By Alexander Sack on 2012-05-16

add support to pass LAVA_DEVICE_TYPE and LAVA_DEVICE through build config

[Paul Sokolovsky (pfalcon)]

My understanding that now LAVA allows to specify specific board ID to run test on (like panda-2, meaning board #2 in panda cluster).

Then comment to LAVA that indeed, could be more consistency for "device_type" and "target" keys...

The code logic appears to ok otherwise, though I'd rewrite it a bit to be more clear (will do myself later I guess).

review: Approve

=== modified file 'build-scripts/post-build-lava.py'
--- build-scripts/post-build-lava.py	2012-05-03 12:38:30 +0000
+++ build-scripts/post-build-lava.py	2012-05-16 13:22:20 +0000
@@ -11,37 +11,37 @@
 # Map a TARGET_PRODUCT to LAVA parameters.
 PRODUCT_MAP = {
     "pandaboard": {
-        "test_target": "panda",
+        "test_device_type": "panda",
         "image_path": "%s%s" % (
             "target/product/",
             "pandaboard")},
     "full_panda": {
-        "test_target": "panda",
+        "test_device_type": "panda",
         "image_path": "%s%s" % (
             "target/product/",
             "panda")},
     "beagleboard": {
-        "test_target": "beaglexm",
+        "test_device_type": "beaglexm",
         "image_path": "%s%s" % (
             "target/product/",
             "beagleboard")},
     "snowball": {
-        "test_target": "snowball_sd",
+        "test_device_type": "snowball_sd",
         "image_path": "%s%s" % (
             "target/product/",
             "snowball")},
     "iMX53": {
-        "test_target": "mx53loco",
+        "test_device_type": "mx53loco",
         "image_path": "%s%s" % (
             "target/product/",
             "iMX53")},
     "origen": {
-        "test_target": "origen",
+        "test_device_type": "origen",
         "image_path": "%s%s" % (
             "target/product/",
             "origen")},
     "vexpress" : {
-        "test_target": "vexpress",
+        "test_device_type": "vexpress",
         "image_path": "%s%s" % (
             "target/product/",
             "vexpress")},
@@ -200,13 +200,27 @@
       }
     })
 
-    config = json.dumps({"job_name": build_url,
-                         "image_type": 'android',
-                         "device_type": PRODUCT_MAP[target_product]["test_target"],
-                         "timeout": 18000,
-                         "actions": actions
-                            },
-                        indent=4)
+    # allow overload lava device_type by build config
+    test_device_type = os.environ.get("LAVA_DEVICE_TYPE")
+    if test_device_type == None:
+        test_device_type = PRODUCT_MAP[target_product]["test_device_type"]
+
+    # allow to submit to a specific device
+    test_device = os.environ.get("LAVA_DEVICE")
+
+    config_json = {"job_name": build_url,
+                   "image_type": 'android',
+                   "timeout": 18000,
+                   "actions": actions
+                  }
+
+    # test_device set will win over test_device_type
+    if test_device is None:
+        config_json["device_type"] = test_device_type
+    else
+        config_json["target"] = test_device
+
+    config = json.dumps(config_json, indent=4)
 
     print config