venv: create venv & run pip in exec
Tempest deleted the venv management scripts [1] so now, puppet-tempest is able to deploy the venv & run pip by itself. [1] https://review.openstack.org/#/c/270564/ Closes-Bug: #1570268 Change-Id: Iacfe61a14d69a8738a4cc4e2cfe29f7d54e91941
This commit is contained in:
parent
af17899b0f
commit
e70aa88930
@ -297,7 +297,7 @@ class tempest(
|
|||||||
if $setup_venv {
|
if $setup_venv {
|
||||||
# virtualenv will be installed along with tox
|
# virtualenv will be installed along with tox
|
||||||
exec { 'setup-venv':
|
exec { 'setup-venv':
|
||||||
command => "/usr/bin/python ${tempest_clone_path}/tools/install_venv.py",
|
command => "/usr/bin/virtualenv ${tempest_clone_path}/.venv && ${tempest_clone_path}/.venv/bin/pip install -U -r requirements.txt",
|
||||||
cwd => $tempest_clone_path,
|
cwd => $tempest_clone_path,
|
||||||
unless => "/usr/bin/test -d ${tempest_clone_path}/.venv",
|
unless => "/usr/bin/test -d ${tempest_clone_path}/.venv",
|
||||||
require => [
|
require => [
|
||||||
|
@ -10,7 +10,7 @@ class tempest::params {
|
|||||||
'openssl-devel',
|
'openssl-devel',
|
||||||
'libffi-devel',
|
'libffi-devel',
|
||||||
'patch',
|
'patch',
|
||||||
'gcc',
|
'gcc'
|
||||||
]
|
]
|
||||||
$python_aodh_tests = 'python-aodh-tests'
|
$python_aodh_tests = 'python-aodh-tests'
|
||||||
$python_ceilometer_tests = 'python-ceilometer-tests'
|
$python_ceilometer_tests = 'python-ceilometer-tests'
|
||||||
@ -41,6 +41,7 @@ class tempest::params {
|
|||||||
'libffi-dev',
|
'libffi-dev',
|
||||||
'patch',
|
'patch',
|
||||||
'gcc',
|
'gcc',
|
||||||
|
'python-virtualenv',
|
||||||
]
|
]
|
||||||
$python_aodh_tests = false
|
$python_aodh_tests = false
|
||||||
$python_ceilometer_tests = false
|
$python_ceilometer_tests = false
|
||||||
|
@ -317,7 +317,8 @@ describe 'tempest' do
|
|||||||
'libssl-dev',
|
'libssl-dev',
|
||||||
'libffi-dev',
|
'libffi-dev',
|
||||||
'patch',
|
'patch',
|
||||||
'gcc' ] }
|
'gcc',
|
||||||
|
'python-virtualenv' ] }
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{ :dev_packages => ['python-devel',
|
{ :dev_packages => ['python-devel',
|
||||||
'libxslt-devel',
|
'libxslt-devel',
|
||||||
@ -325,7 +326,7 @@ describe 'tempest' do
|
|||||||
'openssl-devel',
|
'openssl-devel',
|
||||||
'libffi-devel',
|
'libffi-devel',
|
||||||
'patch',
|
'patch',
|
||||||
'gcc' ] }
|
'gcc'] }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user