almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

test: Install beakerlib on non-RHEL images

Browse Source 
Commit 4783f6562f introduced the assumption that beakerlib is already
installed in non-RHEL images. As the test script runs without `set -e`,
this hasn't been noticed as the test silently succeeds.

Go back to installing beakerlib everywhere.
This commit is contained in:
Martin Pitt 2019-05-22 16:42:03 +02:00 committed by Martin Pitt
parent c261cec33d
commit 3b467f1cd7
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/vm.install
View File

@ -2,15 +2,19 @@
SRPM="$1" SRPM="$1"
if ! rpm -q beakerlib && [ $(. /etc/os-release && echo $ID) = "rhel" ]; then if ! rpm -q beakerlib; then
(cd /etc/yum.repos.d; curl -O -L http://download.devel.redhat.com/beakerrepos/beaker-client-RedHatEnterpriseLinux.repo) 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)
# The beaker repository doesn't include repos for minor releases # The beaker repository doesn't include repos for minor releases
VERSION=$(. /etc/os-release && echo ${VERSION_ID%.*}) VERSION=$(. /etc/os-release && echo ${VERSION_ID%.*})
yum install -y --releasever=$VERSION --setopt=sslverify=0 beakerlib yum install -y --releasever=$VERSION --setopt=sslverify=0 beakerlib
# prevent yum from trying to sync the cache again later (it fails without sslverify=0) # prevent yum from trying to sync the cache again later (it fails without sslverify=0)
rm /etc/yum.repos.d/beaker-client-RedHatEnterpriseLinux.repo rm /etc/yum.repos.d/beaker-client-RedHatEnterpriseLinux.repo
else
yum install -y beakerlib
fi
fi fi
# Grow root partition to make room for images. This only works on Fedora right now. # Grow root partition to make room for images. This only works on Fedora right now.