diff options
| -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 28d013165..be56e57ac 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/' |