Merge "ppc64le: Ensure that rabbitmq-server.repo exists before trying sed"
This commit is contained in:
commit
f9b229841d
|
@ -112,8 +112,12 @@ COPY {{ repo_file }} /etc/yum.repos.d/{{ repo_file }}
|
|||
|
||||
# NOTE(hrw): 'rabbitmq-server' is 'noarch' so we can install it on ppc64le from
|
||||
# repo for other architecture.
|
||||
# NOTE(mjturek): tripleo-ci overrides these repos so the file would not exist
|
||||
# in that case. We test for the file's existence to avoid sed failing in that case.
|
||||
{% if base_arch == 'ppc64le' %}
|
||||
RUN sed -i -e 's/\$basearch/x86_64/g' /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo
|
||||
RUN if [[ -e /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo ]]; then \
|
||||
sed -i -e 's/\$basearch/x86_64/g' /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo; \
|
||||
fi
|
||||
{% endif %}
|
||||
|
||||
{% block base_centos_repo_overrides_post_copy %}{% endblock %}
|
||||
|
|
Loading…
Reference in New Issue