diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-27 08:02:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-27 08:02:15 +0000 |
| commit | 6e4586b6ea9a60fd4ccc0be236db8c3b12989939 (patch) | |
| tree | 3970f5fdb9d2d2f60304b0c141cca5fa5b067b7f /docker | |
| parent | 5c82061beceb95b574e3b9ed8c41f893b5f9352f (diff) | |
| parent | 3853b7dbc68c9b05e8ceb8265d543daa93414419 (diff) | |
| download | kolla-6e4586b6ea9a60fd4ccc0be236db8c3b12989939.tar.gz kolla-6e4586b6ea9a60fd4ccc0be236db8c3b12989939.zip | |
Merge "Set proper workdir for different distro in tempest container"
Diffstat (limited to 'docker')
| -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 |