Merge "Allow operators to override versionlock for redhat in base"

This commit is contained in:
Jenkins 2016-08-31 17:48:08 +00:00 committed by Gerrit Code Review
commit dd0988f074

View File

@ -157,11 +157,13 @@ RUN yum -y install \
{# We are back to the basic if conditional here which is:
if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] #}
{% block base_redhat_binary_versionlock %}
RUN yum -y update \
&& yum -y install \
yum-plugin-versionlock \
&& yum clean all
COPY versionlock.list /etc/yum/pluginconf.d/
{% endblock %}
{% if install_type == 'binary' %}
{% set base_centos_binary_packages = [