Merge lp:~vishalbhoj/linaro-android-build-tools/Add-lava-imgs-support-Fix-homescreen into lp:linaro-android-build-tools

[vishal]

The job was submitted to LAVA. The branch is tested in this job:
https://android-build.linaro.org/builds/~vishalbhoj/nexus-job-test/

[Paul Sokolovsky (pfalcon)]

Sorry for nitpicking, but please make sure there's a space after comma in "/userdata.",file_extension .

[lp:~vishalbhoj/linaro-android-build-tools/Add-lava-imgs-support-Fix-homescreen]

620. By vishal on 2013-05-24

cleanup coding style

[Paul Sokolovsky (pfalcon)]

Thanks!

review: Approve

=== modified file 'build-scripts/post-build-lava.py'
--- build-scripts/post-build-lava.py	2013-05-22 18:52:05 +0000
+++ build-scripts/post-build-lava.py	2013-05-24 07:55:31 +0000
@@ -361,6 +361,13 @@
     # if this value is not set, then use the 18000 seconds as the default value
     default_timeout = os.environ.get("DEFAULT_TIMEOUT", 18000)
 
+    # Set the file extension based on the type of artifacts
+    artifact_type = os.environ.get("MAKE_TARGETS", "tarball")
+    if artifact_type == "droidcore":
+        file_extension = "img"
+    else:
+        file_extension = "tar.bz2" 
+
     # Board-specific parameters
     if target_product not in PRODUCT_MAP:
         # We don't know how to test this job, so skip testing.
@@ -394,12 +401,12 @@
     "command": "deploy_linaro_android_image",
     "parameters":
       {
-        "boot": "%s%s" % (download_url,
-                            "/boot.tar.bz2"),
-        "system":"%s%s" % (download_url,
-                             "/system.tar.bz2"),
-        "data":"%s%s" % (download_url,
-                           "/userdata.tar.bz2")
+        "boot": "%s%s%s" % (download_url,
+                            "/boot.", file_extension),
+        "system":"%s%s%s" % (download_url,
+                             "/system.", file_extension),
+        "data":"%s%s%s" % (download_url,
+                           "/userdata.", file_extension)
       },
     "metadata":
       {
@@ -415,7 +422,7 @@
     if wait_for_homescreen == False:
         common_actions.append({"command": "boot_linaro_android_image",
             "parameters": {
-            "wait_for_home_screen": "false"
+            "wait_for_home_screen": False
             }
         })
     else: