Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the Testing Farm testsuite #1405

Merged
merged 2 commits into from
Jul 17, 2024
Merged

Fix the Testing Farm testsuite #1405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8cf90f
tests: don't enforce dnf4 installation into bootstrap
praiskup Jul 15, 2024
a2728fe
tests: fix rootdir test for today's Fedora
praiskup Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions mock/integration-tests/22-rootdir.tst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,17 @@ fi
. "${TESTDIR}/functions"
set -e

TMPDIR=$(mktemp -d)
cleanup() { rm -rf "$TMPDIR"; }
# creating special files (e.g. /dev/null doesn't work below tmpfs)
WORKDIR=$(mktemp -d -p "$HOME")

cleanup() { rm -rf "$WORKDIR"; }
trap cleanup EXIT

header "mock with --rootdir option"

for isolation in simple nspawn; do
runcmd "$MOCKCMD --isolation=$isolation --rootdir=$TMPDIR --scrub=chroot"
runcmd "$MOCKCMD --isolation=$isolation --rootdir=$TMPDIR --scrub=bootstrap"
runcmd "$MOCKCMD --isolation=$isolation --rootdir=$TMPDIR --bootstrap-chroot ${TESTDIR}/test-C-1.1-0.src.rpm"
rootdir=$WORKDIR/$isolation
runcmd "$MOCKCMD --isolation=$isolation --rootdir=$rootdir --scrub=chroot"
runcmd "$MOCKCMD --isolation=$isolation --rootdir=$rootdir --scrub=bootstrap"
runcmd "$MOCKCMD --isolation=$isolation --rootdir=$rootdir --bootstrap-chroot ${TESTDIR}/test-C-1.1-0.src.rpm"
done
10 changes: 1 addition & 9 deletions mock/integration-tests/runtests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,7 @@ else
MOCKSRPM=$1
fi

if [ -e /usr/bin/dnf ]; then
header "pre-populating the cache (DNF)"
runcmd "$MOCKCMD --init --dnf"
header "clean up"
runcmd "$MOCKCMD --offline --clean"
else
header "pre-populating the cache (YUM)"
runcmd "$MOCKCMD --init"
fi
runcmd "$MOCKCMD --init"
header "installing dependencies for $MOCKSRPM"
runcmd "$MOCKCMD --disable-plugin=tmpfs --installdeps $MOCKSRPM"
if [ ! -e $CHROOT/usr/include/python* ]; then
Expand Down
Loading