a9d08726f5
Currently if the install_packages macro is run with an empty package list, it will add a yum or apt-get command with no packages listed. This bug fix aims to omit this line when no packages have been given, or, the operator wants to use the "_override" / "_remove" functionality to disable all packages being installed in a Dockerfile. Co-Authored-By: Paul Bourke <paul.bourke@oracle.com> Change-Id: Ifaaaebfccc3adb0f2f68a35ac08e59378bc87fdb Closes-bug: 1612446
35 lines
1.2 KiB
Django/Jinja
35 lines
1.2 KiB
Django/Jinja
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'] %}
|
|
{% set tempest_packages = ['openstack-tempest'] %}
|
|
{% elif base_distro in ['ubuntu'] %}
|
|
{% set tempest_packages = ['tempest'] %}
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(tempest_packages | customizable("packages")) }}
|
|
|
|
{% elif install_type == 'source' %}
|
|
|
|
ADD tempest-archive /tempest-source
|
|
# NOTE(Jeffrey4l): remove the tempest version constraint in the
|
|
# upper-constrains.txt file. Otherwise, it will be failed.
|
|
RUN ln -s tempest-source/* tempest \
|
|
&& sed -i 's/^tempest===.*$//' requirements/upper-constraints.txt \
|
|
&& /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 %}
|
|
|
|
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 }}
|