tests: switch to using podman instead of docker
Note: use podman-docker to avoid changing tests too much. This
is also what we have on the RHEL branches.
There's no service to be started/restarted so remove everything
related to docker service.
Cherry-picked from e1b45958f4
Related: rhbz#1769525
This commit is contained in:
parent
493055c03c
commit
471adbd8de
@ -17,10 +17,6 @@ if ! rpm -q beakerlib; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! rpm -q podman-docker; then
|
|
||||||
yum install -y podman-docker
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! rpm -q git; then
|
if ! rpm -q git; then
|
||||||
yum install -y git
|
yum install -y git
|
||||||
fi
|
fi
|
||||||
@ -44,3 +40,11 @@ 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
|
||||||
|
|
||||||
|
if [ -f /usr/bin/docker ]; then
|
||||||
|
yum remove -y $(rpm -qf /usr/bin/docker)
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! rpm -q podman-docker; then
|
||||||
|
yum install -y podman-docker
|
||||||
|
fi
|
||||||
|
@ -30,14 +30,6 @@ rlJournalStart
|
|||||||
|
|
||||||
rlPhaseStartTest "compose finished"
|
rlPhaseStartTest "compose finished"
|
||||||
wait_for_compose $UUID
|
wait_for_compose $UUID
|
||||||
|
|
||||||
# Running a compose can lead to a different selinux policy in the
|
|
||||||
# kernel, which may break docker. Reload the policy from the host and
|
|
||||||
# restart docker as a workaround.
|
|
||||||
# See https://bugzilla.redhat.com/show_bug.cgi?id=1711813
|
|
||||||
semodule -R
|
|
||||||
systemctl restart docker
|
|
||||||
|
|
||||||
rlRun -t -c "$CLI compose image $UUID"
|
rlRun -t -c "$CLI compose image $UUID"
|
||||||
IMAGE="$UUID-root.tar.xz"
|
IMAGE="$UUID-root.tar.xz"
|
||||||
rlPhaseEnd
|
rlPhaseEnd
|
||||||
|
Loading…
Reference in New Issue
Block a user