commit ba4e00f161e55bd7967e154aba7755f96470e935
author Dan Shi <dshi@chromium.org> Tue Oct 27 12:03:53 2015 -0700
committer chrome-bot <chrome-bot@chromium.org> Tue Oct 27 17:58:52 2015 -0700
tree 4f6e698e4b6e57374f5fbe1fb880072bfcd26635
parent f5fa15c68303183474b858c3b3ffb499400ff02e

Fix a regex issue in Android image build name

Also, do not unzip the Android image on devserver, since the files needs to be
staged in the server where fastboot call is made.

BUG=chromium:512668
TEST=run devserver locally, and
curl http://localhost:8082/stage?target=shamu-userdebug\&build_id=2284311\&artifacts=zip_images\&branch=git_master

Change-Id: Ib82109d845a821a52e0f9b1266fe60cec5815a66
Reviewed-on: https://chromium-review.googlesource.com/309106
Commit-Ready: Dan Shi <dshi@chromium.org>
Tested-by: Dan Shi <dshi@chromium.org>
Reviewed-by: Simran Basi <sbasi@chromium.org>

build_artifact.py

diff --git a/build_artifact.py b/build_artifact.py
index 884cd75..44969ba 100755
--- a/build_artifact.py
+++ b/build_artifact.py
@@ -45,7 +45,7 @@
 
 ############ Actual filenames of Android build artifacts ############
 
-ANDROID_IMAGE_ZIP = '*-img-*.zip'
+ANDROID_IMAGE_ZIP = r'.*-img-[^-]*\.zip'
 ANDROID_RADIO_IMAGE = 'radio.img'
 ANDROID_BOOTLOADER_IMAGE = 'bootloader.img'
 ANDROID_FASTBOOT = 'fastboot'
@@ -622,7 +622,7 @@
   android_artifact_map.setdefault(tag, []).append(artifact)
 
 
-_AddAndroidArtifact(artifact_info.ANDROID_ZIP_IMAGES, BundledArtifact,
+_AddAndroidArtifact(artifact_info.ANDROID_ZIP_IMAGES, Artifact,
                     ANDROID_IMAGE_ZIP, is_regex_name=True)
 _AddAndroidArtifact(artifact_info.ANDROID_RADIO_IMAGE, Artifact,
                     ANDROID_RADIO_IMAGE)