diff options
| author | Zuul <zuul@review.opendev.org> | 2019-04-29 14:30:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-04-29 14:30:50 +0000 |
| commit | 9e9e31ed2c671d7547354708bb8decc05c737ecd (patch) | |
| tree | bea8dfbd7a522c6aab3baa3814faae390adf6bb9 /docker | |
| parent | 105cec6d421c565b8769d983a67fe997fd94738c (diff) | |
| parent | 8b8958459809940b812364542a6994a89624f981 (diff) | |
| download | kolla-9e9e31ed2c671d7547354708bb8decc05c737ecd.tar.gz kolla-9e9e31ed2c671d7547354708bb8decc05c737ecd.zip | |
Merge "Reuse /var/lib/tempest symlink for rpm also"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/tempest/Dockerfile.j2 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index c2c16e15a..ec0edf161 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -11,17 +11,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set tempest_packages = ['openstack-tempest-all'] %} -{{ macros.install_packages(tempest_packages | customizable("packages")) }} -RUN ln -sf /usr/share/openstack-tempest /tempest - {% elif base_package_type == 'deb' %} {% set tempest_packages = ['tempest'] %} + {% endif %} + {{ macros.install_packages(tempest_packages | customizable("packages")) }} RUN ln -sf /var/lib/tempest /tempest - {% endif %} - {% elif install_type == 'source' %} ADD tempest-archive /tempest-source |