From e6bcd8770b5235d15e530f7b97bb17c19150c253 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 13 Nov 2018 11:21:25 +0100 Subject: [PATCH] build-from-source: also (re)install noarch packages Fix installing also noarch packages. I think they were omitted wrongly before, and installing them now might break existing assumptions during CI (like, which packages are installed and which not). But since the script anyway didn't ensure which RPMs are installed prevoiusly, it was very likely that packages like NetworkManager-config-server was already installed. CI needs to always anticipate that such packages may be installed and act accordingly. Usually, this just means to explicitly overwrite the configuration snippets provided by these packages. --- contrib/rh-bkr/build-from-source.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/rh-bkr/build-from-source.sh b/contrib/rh-bkr/build-from-source.sh index 7f6c89e520..b40d8d6233 100755 --- a/contrib/rh-bkr/build-from-source.sh +++ b/contrib/rh-bkr/build-from-source.sh @@ -150,11 +150,11 @@ if [[ "$DO_TEST_PACKAGE" == yes || "$DO_INSTALL" == yes ]]; then fi if [[ "$DO_INSTALL" == yes ]]; then - pushd "./contrib/fedora/rpm/latest/RPMS/$ARCH/" - for p in $(ls -1 ./*.rpm | sed 's#.*\(NetworkManager.*\)-1\.[0-9]\+\..*#\1#'); do + pushd "./contrib/fedora/rpm/latest/RPMS/" + for p in $(ls -1 ./{$ARCH,noarch}/*.rpm | sed -n 's#^\./[^/]\+/\(NetworkManager.*\)-1\.[0-9]\+\..*#\1#p'); do $SUDO rpm -e --nodeps $p || true done - $SUDO yum install -y ./*.rpm + $SUDO yum install -y ./{$ARCH,noarch}/*.rpm popd # ensure that the expected NM is installed.