From 555765a7afd21fabd1b760af946b0e9350cc2eae Mon Sep 17 00:00:00 2001 From: Mike Turek Date: Mon, 23 Sep 2019 16:48:50 +0000 Subject: ppc64le: Ensure that rabbitmq-server.repo exists before trying sed TripleO container builds are currently failing for ppc64le as the rabbitmq repo file doesn't exist, causing sed to fail. [0] The file not existing is expected for TripleO image builds as these repos are overriden in this case. [1] This patch tests that the file exists to prevent this failure. [0] https://centos.logs.rdoproject.org/tripleo-upstream-containers-build-master-ppc64le/1540/logs/logs/build.log [1] http://eavesdrop.openstack.org/irclogs/%23openstack-kolla/%23openstack-kolla.2019-09-23.log.html#t2019-09-23T16:42:29 Change-Id: I7bf6d064ad8deb94a8fe53f4f4735f7b13ff27b1 Co-Authored-By: Mark Goddard --- docker/base/Dockerfile.j2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 8ce1b4155..98faf1c80 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -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 %} -- cgit v1.2.3