diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-11-25 02:12:11 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-11-25 02:13:11 +0800 |
| commit | 3853b7dbc68c9b05e8ceb8265d543daa93414419 (patch) | |
| tree | 83b291577266a5dbc8cfe5991ac74ff4de689dd9 | |
| parent | 390b4a24f83c10ea0845b0df58070d687eabe509 (diff) | |
| download | kolla-3853b7dbc68c9b05e8ceb8265d543daa93414419.tar.gz kolla-3853b7dbc68c9b05e8ceb8265d543daa93414419.zip | |
Set proper workdir for different distro in tempest container
Change-Id: I382af2cb65529c7f425722ddceb6d3ddc4773890
| -rw-r--r-- | docker/tempest/Dockerfile.j2 | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index 1e60e7295..dbfb0aa9c 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'] %} + +{{ macros.install_packages(tempest_packages | customizable("packages")) }} +RUN ln -sf /usr/share/openstack-tempest-* /tempest + {% elif base_distro in ['ubuntu'] %} {% set tempest_packages = ['tempest'] %} - {% endif %} {{ 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 |