OpenStack Compute (nova)

Merge lp:~mordred/nova/fix-venv-test into lp:~hudson-openstack/nova/trunk

  1. fix-venv-test
  2. Merge into trunk
Proposed by Monty Taylor
Status: Merged
Approved by: Soren Hansen
Approved revision: 255
Merged at revision: 282
Proposed branch: lp:~mordred/nova/fix-venv-test
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 23 lines (+5/-0)
2 files modified
tools/install_venv.py (+4/-0)
tools/pip-requires (+1/-0)
To merge this branch: bzr merge lp:~mordred/nova/fix-venv-test
Reviewer Review Type Date Requested Status
termie (community) Approve
Jay Pipes (community) Approve
Review via email: mp+33670@code.launchpad.net

Description of the change

A small fix to the install_venv program to allow us to run it on the tarmac box as part of the tarmac build.

To post a comment you must log in.
Revision history for this message
Jay Pipes (jaypipes) wrote :

lgtm :)

review: Approve
Revision history for this message
OpenStack Infra (hudson-openstack) wrote :

The attempt to merge lp:~mordred/nova/fix-venv-test into lp:nova failed.Below is the output from the failed tests.

Traceback (most recent call last):
  File "run_tests.py", line 46, in <module>
    from twisted.scripts import trial as trial_script
ImportError: No module named twisted.scripts

Revision history for this message
Vish Ishaya (vishvananda) wrote :

not sure about error message here. Is hudson missing some of the twisted packages?

Revision history for this message
termie (termie) wrote :

hmm, twisted.scripts might not be installed the same way via debian packages? I'm not sure on how the twisted people have split up the packages (twisted-core, twisted-trial, twisted-twistd, and such).

Then again, it certainly would seem that we are installing it ourselves...

review: Approve
Revision history for this message
Soren Hansen (soren) wrote :

This works for me on the Hudson box:

$ python -c 'from twisted.scripts import trial'
$

...so I'm just going to try this again.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/install_venv.py'
2--- tools/install_venv.py 2010-08-18 21:19:39 +0000
3+++ tools/install_venv.py 2010-08-25 16:47:43 +0000
4@@ -88,6 +88,10 @@
5
6 def install_dependencies(venv=VENV):
7 print 'Installing dependencies with pip (this can take a while)...'
8+ # Install greenlet by hand - just listing it in the requires file does not
9+ # get it in stalled in the right order
10+ run_command(['tools/with_venv.sh', 'pip', 'install', '-E', venv, 'greenlet'],
11+ redirect_output=False)
12 run_command(['tools/with_venv.sh', 'pip', 'install', '-E', venv, '-r', PIP_REQUIRES],
13 redirect_output=False)
14 run_command(['tools/with_venv.sh', 'pip', 'install', '-E', venv, TWISTED_NOVA],
15
16=== modified file 'tools/pip-requires'
17--- tools/pip-requires 2010-08-18 15:44:24 +0000
18+++ tools/pip-requires 2010-08-25 16:47:43 +0000
19@@ -18,3 +18,4 @@
20 zope.interface==3.6.1
21 mox==0.5.0
22 -f http://pymox.googlecode.com/files/mox-0.5.0.tar.gz
23+greenlet==0.3.1