summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2013-03-06 16:00:37 -0500
committerDan Prince <dprince@redhat.com>2013-03-07 11:25:25 -0500
commit0b2e8d6e0638dc1764965581f25266144b5abb9d (patch)
tree629f6601b3643732a57cfc22725ccf45fa172d3e /tools
parentca490d48a762a423449c654d5a7caeadecf2f6ca (diff)
downloadnova-0b2e8d6e0638dc1764965581f25266144b5abb9d.tar.gz
nova-0b2e8d6e0638dc1764965581f25266144b5abb9d.tar.xz
nova-0b2e8d6e0638dc1764965581f25266144b5abb9d.zip
Update tox.ini to support RHEL 6.x.
In order to support running unit tests on RHEL 6.x we need to patch eventlet with contrib/redhat-eventlet.patch. We already have support for this in the tools/install_venv_common.py but we need to make a couple changes to allow tox to consume this: 1) Sync in the latest intall_venv_common.py from oslo. This changes patch to use the -N option (ignore already applied patches) and makes it safe to call the patching function more than once. 2) Add a new patch_tox_venv.py script in tools. 3) Update tox.ini to call patch_tox_venv.py before it runs tests and coverage. Change-Id: I3e2b07c3f718e4aede5c5f231ff0cdb7721ec885
Diffstat (limited to 'tools')
-rw-r--r--tools/install_venv_common.py3
-rw-r--r--tools/patch_tox_venv.py38
2 files changed, 40 insertions, 1 deletions
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py
index 7ecf5010f..413065640 100644
--- a/tools/install_venv_common.py
+++ b/tools/install_venv_common.py
@@ -185,7 +185,8 @@ class Fedora(Distro):
self.run_command(['sudo', 'yum', 'install', '-y', pkg], **kwargs)
def apply_patch(self, originalfile, patchfile):
- self.run_command(['patch', originalfile, patchfile])
+ self.run_command(['patch', '-N', originalfile, patchfile],
+ check_exit_code=False)
def install_virtualenv(self):
if self.check_cmd('virtualenv'):
diff --git a/tools/patch_tox_venv.py b/tools/patch_tox_venv.py
new file mode 100644
index 000000000..399acbcfc
--- /dev/null
+++ b/tools/patch_tox_venv.py
@@ -0,0 +1,38 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2013 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import os
+import sys
+
+import install_venv_common as install_venv
+
+
+def main(argv):
+ root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+
+ venv = os.environ['VIRTUAL_ENV']
+
+ pip_requires = os.path.join(root, 'tools', 'pip-requires')
+ test_requires = os.path.join(root, 'tools', 'test-requires')
+ py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
+ project = 'Nova'
+ install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
+ py_version, project)
+ #NOTE(dprince): For Tox we only run post_process (which patches files, etc)
+ install.post_process()
+
+if __name__ == '__main__':
+ main(sys.argv)