From 34fce6c3d65eb7f31f0ecb08856f1f64a3db9ba5 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Fri, 3 Apr 2020 18:12:35 +0530 Subject: Collectd: ignore failure of disabling epel repos https://review.opendev.org/#/c/710822/ added disabling of epel and epel-modular repos. There are cases when epel repos are not setup in that case dnf config-manager will fail. Let's ignore the failure in such cases. This change is needed only for Train branch. Partially-Implements: blueprint centos-rhel-8 Change-Id: I4aeb3971b82d461a305264490e829aaacfac9b24 --- docker/collectd/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index 418a1a9e7..f4447ff2b 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -85,7 +85,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endif %} {% if distro_package_manager == 'dnf' %} # make sure, collectd is pulled from centos-opstools -RUN dnf config-manager --disable epel epel-modular +RUN dnf config-manager --disable epel epel-modular || true {% elif distro_package_manager == 'yum' %} # make sure, collectd is pulled from centos-opstools RUN yum-config-manager --disable epel -- cgit v1.2.3