[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 134: Fix for Bug 872948

Message ID 20111014193513.31058.59231.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Paul Larson Oct. 14, 2011, 7:35 p.m.
Merge authors:
  Yongqin Liu (liuyq0307)
Related merge proposals:
  https://code.launchpad.net/~liuyq0307/lava-dispatcher/fix-872948/+merge/79309
  proposed by: Yongqin Liu (liuyq0307)
  review: Approve - Spring Zhang (qzhang)
------------------------------------------------------------
revno: 134 [merge]
committer: Paul Larson <paul.larson@canonical.com>
branch nick: lava-dispatcher
timestamp: Fri 2011-10-14 14:33:06 -0500
message:
  Fix for Bug 872948
modified:
  doc/lava-android-test-leb-panda.json
  lava_dispatcher/__init__.py


--
lp:lava-dispatcher
https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk

You are subscribed to branch lp:lava-dispatcher.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription

Patch

=== modified file 'doc/lava-android-test-leb-panda.json'
--- doc/lava-android-test-leb-panda.json	2011-09-27 10:12:50 +0000
+++ doc/lava-android-test-leb-panda.json	2011-10-13 15:52:18 +0000
@@ -8,14 +8,14 @@ 
       "command": "deploy_linaro_android_image",
       "parameters":
         {
-          "boot": "https://android-build.linaro.org/jenkins/job/linaro-android_leb-panda/246/artifact/build/out/target/product/pandaboard/boot.tar.bz2",
-          "system": "https://android-build.linaro.org/jenkins/job/linaro-android_leb-panda/246/artifact/build/out/target/product/pandaboard/system.tar.bz2",
-          "data": "https://android-build.linaro.org/jenkins/job/linaro-android_leb-panda/246/artifact/build/out/target/product/pandaboard/userdata.tar.bz2"
+          "boot": "https://android-build.linaro.org/jenkins/job/gerrit-bot_pandaboard/12/artifact/build/out/target/product/pandaboard/boot.tar.bz2",
+          "system": "https://android-build.linaro.org/jenkins/job/gerrit-bot_pandaboard/12/artifact/build/out/target/product/pandaboard/system.tar.bz2",
+          "data": "https://android-build.linaro.org/jenkins/job/gerrit-bot_pandaboard/12/artifact/build/out/target/product/pandaboard/userdata.tar.bz2"
         },
       "metadata":
         {
           "rootfs.type": "android",
-          "rootfs.build": "246"
+          "rootfs.build": "12"
         }
     },
     {

=== modified file 'lava_dispatcher/__init__.py'
--- lava_dispatcher/__init__.py	2011-10-14 03:14:31 +0000
+++ lava_dispatcher/__init__.py	2011-10-14 19:33:06 +0000
@@ -55,7 +55,7 @@ 
     def run(self):
         lava_commands = get_all_cmds()
 
-        if self.job_data['actions'][-1]['command'] == 'submit_results':
+        if self.job_data['actions'][-1]['command'].startswith("submit_results"):
             submit_results = self.job_data['actions'].pop(-1)
         else:
             submit_results = None