diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-14 14:14:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-14 14:14:48 +0000 |
| commit | 6ea99983fcaf13f90efff1c20a3aa20db0af92ba (patch) | |
| tree | c37c28153eb954b6c06d4917eea7a0e2247e8641 | |
| parent | 1f899e1c99a90abcc1e024afd5577d1edfdff959 (diff) | |
| parent | 43d2a0b78fb5506a868d3baab1f6bf7c16c0ab91 (diff) | |
| download | kolla-6ea99983fcaf13f90efff1c20a3aa20db0af92ba.tar.gz kolla-6ea99983fcaf13f90efff1c20a3aa20db0af92ba.zip | |
Merge "Customizations for Tempest"
| -rw-r--r-- | docker/tempest/Dockerfile.j2 | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index 8b389116d..0e1f5edc1 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -1,20 +1,17 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% import "macros.j2" as macros with context %} + {% if install_type == 'binary' %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} - -RUN yum -y install \ - openstack-tempest \ - && yum clean all - + {% set tempest_packages = ['openstack-tempest'] %} {% elif base_distro in ['ubuntu'] %} + {% set tempest_packages = ['tempest'] %} + {% endif %} -RUN apt-get -y install --no-install-recommends \ - tempest \ - && apt-get clean +RUN {{ macros.install_packages(tempest_packages | customizable("packages")) }} - {% endif %} {% elif install_type == 'source' %} ADD tempest-archive /tempest-source @@ -32,4 +29,6 @@ WORKDIR /tempest COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start +{% block tempest_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} |