From 6e278d4dba9154287ed6764a70a415079f72d4ea 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#1769525
---
 test/vm.install | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/vm.install b/test/vm.install
index 92b6fb19..c83bf7f7 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
+
 if ! rpm -q beakerlib; then
     if [ $(. /etc/os-release && echo $ID) = "rhel" ]; then
         (cd /etc/yum.repos.d; curl -O -L http://download.devel.redhat.com/beakerrepos/beaker-client-RedHatEnterpriseLinux.repo)
@@ -33,7 +37,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