Always remove lorax-composer & composer-cli RPMs before installing them
this will ensure locally built packages are always installed
This commit is contained in:
parent
92bf03ea51
commit
29492b62f6
@ -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
|
||||||
|
|
||||||
if ! rpm -q beakerlib; then
|
if ! rpm -q beakerlib; then
|
||||||
if [ $(. /etc/os-release && echo $ID) = "rhel" ]; 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)
|
(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 --verbose --no-clean --resultdir build-results --rebuild $SRPM"
|
su builder -c "/usr/bin/mock --verbose --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