diff options
| author | Zuul <zuul@review.openstack.org> | 2018-01-25 10:16:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-01-25 10:16:15 +0000 |
| commit | f62f5ae2fa5e7808722f9b37b48a50b39c20b46d (patch) | |
| tree | bb9f3346611c6e1ef33211493f3c6492d03d2062 /docker | |
| parent | 9093c7bd4c6fc9cd87837a1e09e9ffda4a6a69cf (diff) | |
| parent | fd85895a546624e7236c282ce740ce1f5b027bc3 (diff) | |
| download | kolla-f62f5ae2fa5e7808722f9b37b48a50b39c20b46d.tar.gz kolla-f62f5ae2fa5e7808722f9b37b48a50b39c20b46d.zip | |
Merge "Include building python-tempestconf from source in Tempest"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/tempest/Dockerfile.j2 | 8 |
1 files changed, 8 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 %} |