openstack/tempest
Code Issues Proposed changes

Use install_venv from oslo to fix no post_process issue

Browse Source 
In a recent oslo sync commit Ib9b07fe733dc2c924ac0eb054fa707dd352a812b,
post_process() has been removed from tools/install_venv_common.py.
However, it's still called in tools/install_venv.

The current code for CentOS looks like trying to install the openssl
after trying to compile pyOpenSSL. So this can't be working.

This change switches tools/install_venv.py to use oslo code to align the
effort as well as fixing original no 'post_process' issue.

Note: openstack-common.conf is not updated. Because the project name
variable in install_venv has to be modified after syncing from oslo.
That makes it not an exact sync but modification after sync now.

Change-Id: Ia50075f9b317315eb939ddb66645987bb9ec69c2
Closes-Bug: #1263940
This commit is contained in:
Masayuki Igawa 2013-12-27 14:15:07 +09:00
parent 9cc56849e4
commit f3d92ecc2e
1 changed files with 17 additions and 30 deletions

47
tools/install_venv.py

@ -1,9 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
# flake8: noqa
#
# Copyright 2010 OpenStack Foundation
# Copyright 2013 IBM Corp.
#
@ -19,66 +17,55 @@
# License for the specific language governing permissions and limitations
# under the License.
"""Installation script for Tempest's development virtualenv."""
import os
import sys
import install_venv_common as install_venv
import install_venv_common as install_venv # noqa
class CentOS(install_venv.Fedora):
"""This covers CentOS."""
def post_process(self):
if not self.check_pkg('openssl-devel'):
self.yum.install('openssl-devel', check_exit_code=False)
def print_help():
"""This prints Help."""
def print_help(venv, root):
help = """
Tempest development environment setup is complete.
Openstack development environment setup is complete.
Tempest development uses virtualenv to track and manage Python dependencies
while in development and testing.
Openstack development uses virtualenv to track and manage Python
dependencies while in development and testing.
To activate the Tempest virtualenv for the extent of your current shell
To activate the Openstack virtualenv for the extent of your current shell
session you can run:
$ source .venv/bin/activate
$ source %s/bin/activate
Or, if you prefer, you can run commands in the virtualenv on a case by case
basis by running:
$ tools/with_venv.sh <your command>
$ %s/tools/with_venv.sh <your command>
Also, make test will automatically use the virtualenv.
"""
print(help)
print(help % (venv, root))
def main(argv):
root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
if os.environ.get('tools_path'):
root = os.environ['tools_path']
venv = os.path.join(root, '.venv')
if os.environ.get('venv'):
venv = os.environ['venv']
pip_requires = os.path.join(root, 'requirements.txt')
test_requires = os.path.join(root, 'test-requirements.txt')
py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
project = 'Tempest'
install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
py_version, project)
if os.path.exists('/etc/redhat-release'):
with open('/etc/redhat-release') as rh_release:
if 'CentOS' in rh_release.read():
install_venv.Fedora = CentOS
options = install.parse_args(argv)
install.check_python_version()
install.check_dependencies()
install.create_virtualenv(no_site_packages=options.no_site_packages)
install.install_dependencies()
install.post_process()
print_help()
print_help(venv, root)
if __name__ == '__main__':
main(sys.argv)