Always remove lorax-composer & composer-cli RPMs before installing them
this will ensure locally built packages are always installed
Cherry-picked from 29492b62f6
Related: rhbz#1770193
This commit is contained in:
parent
553498d543
commit
50aa59cec1
@ -2,6 +2,10 @@
|
|||||||
|
|
||||||
SRPM="$1"
|
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"
|
LATEST_REPO="/etc/yum.repos.d/rhel7-rel-eng-latest.repo"
|
||||||
if [ ! -f "$LATEST_REPO" ]; then
|
if [ ! -f "$LATEST_REPO" ]; then
|
||||||
cat > $LATEST_REPO << __EOF__
|
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"
|
su builder -c "/usr/bin/mock --no-clean --resultdir build-results --rebuild $SRPM"
|
||||||
|
|
||||||
packages=$(find build-results -name '*.rpm' -not -name '*.src.rpm')
|
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
|
yum install -y $packages
|
||||||
|
|
||||||
systemctl enable lorax-composer.socket
|
systemctl enable lorax-composer.socket
|
||||||
|
Loading…
Reference in New Issue
Block a user