Merge lp:~le-chi-thu/lava-dispatcher/lava-test-deployment-fixes into lp:lava-dispatcher

Proposed by Le Chi Thu
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: 241
Merged at revision: 242
Proposed branch: lp:~le-chi-thu/lava-dispatcher/lava-test-deployment-fixes
Merge into: lp:lava-dispatcher
Diff against target: 29 lines (+5/-5)
1 file modified
lava_dispatcher/actions/lava-test.py (+5/-5)
To merge this branch: bzr merge lp:~le-chi-thu/lava-dispatcher/lava-test-deployment-fixes
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Needs Fixing
Michael Hudson-Doyle (community) Approve
Review via email: mp+96670@code.launchpad.net

Description of the change

Fixes apt-get problem and -y was used without --force-yes
call "lava-test reset" after the lava-test is installed.

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Looks fine!

review: Approve
Revision history for this message
Dave Pigott (dpigott) wrote :

It's probably because I don't fully understand, but why have you removed the deployment check?

Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Changelog entry please, grr!

review: Needs Fixing
Revision history for this message
Le Chi Thu (le-chi-thu) wrote :

The patch already merged. I will not forget the change log next time :-)

/Chi Thu

On 9 March 2012 11:30, Zygmunt Krynicki <email address hidden> wrote:
> Review: Needs Fixing
>
> Changelog entry please, grr!
> --
> https://code.launchpad.net/~le-chi-thu/lava-dispatcher/lava-test-deployment-fixes/+merge/96670
> You are the owner of lp:~le-chi-thu/lava-dispatcher/lava-test-deployment-fixes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lava_dispatcher/actions/lava-test.py'
2--- lava_dispatcher/actions/lava-test.py 2012-02-24 00:34:24 +0000
3+++ lava_dispatcher/actions/lava-test.py 2012-03-08 22:00:24 +0000
4@@ -31,10 +31,10 @@
5 #install bazaar in tester image
6 session.run('apt-get update')
7 #Install necessary packages for build lava-test
8- cmd = ('apt-get -y install '
9+ cmd = ('apt-get -y --force-yes install '
10 'bzr usbutils python-apt python-setuptools python-simplejson lsb-release')
11 session.run(cmd, timeout=2400)
12- session.run("apt-get -y install python-pip")
13+ session.run("apt-get -y --force-yes install python-pip")
14
15 dispatcher_config = client.context.config
16 lava_test_url = dispatcher_config.get("LAVA_TEST_URL")
17@@ -42,10 +42,10 @@
18 session.run('pip install -e ' + lava_test_url)
19
20 #Test if lava-test installed
21- rc = session.run('lava-test help', timeout=60)
22- if rc != 0:
23- raise CriticalError("lava-test deployment failed")
24+ session.run('which lava-test', timeout=60)
25
26+ # cleanup the lava-test - old results, cached files...
27+ session.run('lava-test reset', timeout=60)
28
29 class cmd_lava_test_run(BaseAction):
30

Subscribers

People subscribed via source and target branches