diff options
| author | Zuul <zuul@review.openstack.org> | 2018-03-12 14:10:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-03-12 14:10:55 +0000 |
| commit | bc86a53f8c577c210f3de2cae5c6bade3b7c76cc (patch) | |
| tree | d93e5bbcc13e196f4a3f4d19493fd0d849e160c2 /docker | |
| parent | 620306b7387de03da7786a689f30a60c0f14928a (diff) | |
| parent | ea262264c6592bf6296eed99a475bb36de2f3fa0 (diff) | |
| download | kolla-bc86a53f8c577c210f3de2cae5c6bade3b7c76cc.tar.gz kolla-bc86a53f8c577c210f3de2cae5c6bade3b7c76cc.zip | |
Merge "Bundle tempest plugins in tempest container"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/tempest/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index 85bd268b8..18d753a31 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -7,10 +7,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set tempest_packages = ['openstack-tempest'] %} + {% set tempest_packages = ['openstack-tempest-all'] %} {{ macros.install_packages(tempest_packages | customizable("packages")) }} -RUN ln -sf /usr/share/openstack-tempest-* /tempest +RUN ln -sf /usr/share/openstack-tempest /tempest {% elif base_distro in ['debian', 'ubuntu'] %} {% set tempest_packages = ['tempest'] %} @@ -29,7 +29,7 @@ ADD plugins-archive / '/tempest' ] %} -{% set tempest_base_plugins_pip_packages = [ +{% set tempest_plugins_pip_packages = [ '/plugins/*' ] %} @@ -39,7 +39,7 @@ 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) }}; \ + {{ macros.install_pip(tempest_plugins_pip_packages) }}; \ fi \ && mkdir -p /etc/tempest /var/log/tempest /etc/tempest/tempest_lock |