openstack/kolla
Code Issues Proposed changes

Merge "Customizations for Tempest"

Browse Source
This commit is contained in:
Jenkins 2016-08-14 14:14:48 +00:00 committed by Gerrit Code Review
commit 6ea99983fc
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docker/tempest/Dockerfile.j2
View File

@ -1,20 +1,17 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
{% set tempest_packages = ['openstack-tempest'] %}
RUN yum -y install \
openstack-tempest \
&& yum clean all
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set tempest_packages = ['tempest'] %}
RUN apt-get -y install --no-install-recommends \
tempest \
&& apt-get clean
{% endif %} {% endif %}
RUN {{ macros.install_packages(tempest_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
ADD tempest-archive /tempest-source ADD tempest-archive /tempest-source
@ -32,4 +29,6 @@ WORKDIR /tempest
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start
{% block tempest_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}