openstack/kolla
Code Issues Proposed changes

Merge "Reuse /var/lib/tempest symlink for rpm also"

Browse Source
This commit is contained in:
Zuul 2019-04-29 14:30:49 +00:00 committed by Gerrit Code Review
commit 9e9e31ed2c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/tempest/Dockerfile.j2
View File

@ -11,17 +11,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set tempest_packages = ['openstack-tempest-all'] %} {% 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' %} {% elif base_package_type == 'deb' %}
{% set tempest_packages = ['tempest'] %} {% set tempest_packages = ['tempest'] %}
{% endif %}
{{ macros.install_packages(tempest_packages | customizable("packages")) }} {{ macros.install_packages(tempest_packages | customizable("packages")) }}
RUN ln -sf /var/lib/tempest /tempest RUN ln -sf /var/lib/tempest /tempest
{% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
ADD tempest-archive /tempest-source ADD tempest-archive /tempest-source