From 3853b7dbc68c9b05e8ceb8265d543daa93414419 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Fri, 25 Nov 2016 02:12:11 +0800 Subject: [PATCH] Set proper workdir for different distro in tempest container Change-Id: I382af2cb65529c7f425722ddceb6d3ddc4773890 --- docker/tempest/Dockerfile.j2 | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index 1e60e7295f..dbfb0aa9cd 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -8,11 +8,17 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set tempest_packages = ['openstack-tempest'] %} - {% elif base_distro in ['ubuntu'] %} - {% set tempest_packages = ['tempest'] %} - {% endif %} {{ macros.install_packages(tempest_packages | customizable("packages")) }} +RUN ln -sf /usr/share/openstack-tempest-* /tempest + + {% elif base_distro in ['ubuntu'] %} + {% set tempest_packages = ['tempest'] %} + +{{ macros.install_packages(tempest_packages | customizable("packages")) }} +RUN ln -sf /var/lib/tempest /tempest + + {% endif %} {% elif install_type == 'source' %} @@ -24,10 +30,10 @@ RUN ln -s tempest-source/* tempest \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /tempest \ && mkdir -p /etc/tempest /var/log/tempest /etc/tempest/tempest_lock -WORKDIR /tempest - {% endif %} +WORKDIR /tempest + COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start