From 50aa59cec1dacae699a5017b62466a74ff4e3e6f Mon Sep 17 00:00:00 2001
From: Alexander Todorov <atodorov@redhat.com>
Date: Thu, 21 Nov 2019 11:10:57 +0200
Subject: [PATCH] Always remove lorax-composer & composer-cli RPMs before
 installing them

this will ensure locally built packages are always installed

Cherry-picked from 29492b62f6aaef4106411874e0012ddaff30ad24

Related: rhbz#1770193
---
 test/vm.install | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/vm.install b/test/vm.install
index 76402178..def0ffb8 100755
--- a/test/vm.install
+++ b/test/vm.install
@@ -2,6 +2,10 @@
 
 SRPM="$1"
 
+# always remove older versions of these RPMs if they exist
+# to ensure newly built packages have been installed
+yum -y remove lorax lorax-composer composer-cli
+
 LATEST_REPO="/etc/yum.repos.d/rhel7-rel-eng-latest.repo"
 if [ ! -f "$LATEST_REPO" ]; then
     cat > $LATEST_REPO << __EOF__
@@ -74,7 +78,6 @@ rm -rf build-results
 su builder -c "/usr/bin/mock --no-clean --resultdir build-results --rebuild $SRPM"
 
 packages=$(find build-results -name '*.rpm' -not -name '*.src.rpm')
-rpm -e --verbose $(basename -a ${packages[@]} | sed 's/-[0-9].*.rpm$//') || true
 yum install -y $packages
 
 systemctl enable lorax-composer.socket