From 8b8958459809940b812364542a6994a89624f981 Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Wed, 17 Apr 2019 11:56:03 +0530 Subject: [PATCH] Reuse /var/lib/tempest symlink for rpm also https://review.openstack.org/#/c/605980/ with this review in tripleo, we use /var/lib/tempest path but in kolla tempest dockerfile /usr/share/openstack-tempest is used which is not mounted in tripleo deployment. Let's reuse the same volume with tempest container instead of /usr/share/openstack-tempest. Change-Id: I402f58ce53fdce426582cf2fc31349da6d2f5ae0 Signed-off-by: Chandan Kumar --- docker/tempest/Dockerfile.j2 | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index c2c16e15a9..ec0edf161d 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