diff options
| author | Chandan Kumar <chkumar@redhat.com> | 2018-01-08 16:19:54 +0530 |
|---|---|---|
| committer | Chandan Kumar <chkumar@redhat.com> | 2018-01-24 07:48:30 +0000 |
| commit | fd85895a546624e7236c282ce740ce1f5b027bc3 (patch) | |
| tree | 9eb625f1c350697ebe08f23b0e95199cb1892559 | |
| parent | d38a885a01900cb40d3eff63f899c896741dfb71 (diff) | |
| download | kolla-fd85895a546624e7236c282ce740ce1f5b027bc3.tar.gz kolla-fd85895a546624e7236c282ce740ce1f5b027bc3.zip | |
Include building python-tempestconf from source in Tempest
* python-tempestconf is an automatic Tempest config generator.
Currently it is used in RefStack and Tripleo projects and
installed directly RDO shipped tempest RPM package. It would
be good to include in Tempest container so that it can be while
using tempest container image from source.
* http://git.openstack.org/cgit/openstack/python-tempestconf
Change-Id: I47e812427343b16662378381e96ab354904256c5
| -rw-r--r-- | docker/tempest/Dockerfile.j2 | 8 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index c57def321..988f512ec 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -23,17 +23,25 @@ RUN ln -sf /var/lib/tempest /tempest {% elif install_type == 'source' %} ADD tempest-archive /tempest-source +ADD plugins-archive / {% set tempest_pip_packages = [ '/tempest', 'nose' ] %} +{% set tempest_base_plugins_pip_packages = [ + '/plugins/*' +] %} + # NOTE(Jeffrey4l): remove the tempest version constraint in the # upper-constrains.txt file. Otherwise, it will be failed. RUN ln -s tempest-source/* tempest \ && sed -i 's/^tempest===.*$//' requirements/upper-constraints.txt \ && {{ macros.install_pip(tempest_pip_packages | customizable("pip_packages")) }} \ + && if [ "$(ls /plugins)" ]; then \ + {{ macros.install_pip(tempest_base_plugins_pip_packages) }}; \ + fi \ && mkdir -p /etc/tempest /var/log/tempest /etc/tempest/tempest_lock {% endif %} diff --git a/kolla/common/config.py b/kolla/common/config.py index 02ab17f09..558b3a87c 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -621,6 +621,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/panko/' 'panko-master.tar.gz')}, + 'tempest-plugin-tempest-conf': { + 'type': 'url', + 'location': ('$tarballs_base/python-tempestconf/' + 'python-tempestconf-master.tar.gz')}, 'rally': { 'type': 'url', 'location': ('$tarballs_base/rally/' |