Merge "ppc64le: Ensure that rabbitmq-server.repo exists before trying sed"

This commit is contained in:
Zuul 2019-09-27 07:35:57 +00:00 committed by Gerrit Code Review
commit f9b229841d
1 changed files with 5 additions and 1 deletions

View File

@ -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 %}