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.

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

Stop trying to guess the name of the libvirt service/socket (fedora-35 necessary changes) #387

Merged
merged 5 commits into from Sep 23, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions test/check-machines-migrate
Expand Up @@ -45,6 +45,11 @@ class TestMachinesMigration(VirtualMachinesCase):
machine2.execute("hostnamectl set-hostname machine2")
machine2.execute(f"systemctl restart {self.getLibvirtServiceName()}")

if machine2.image in ["fedora-35"]:
# HACK for missing deps on virtlockd/virtlogd sockets - needed till f-35 uses libvirt v7.7.0
# https://github.com/libvirt/libvirt/commit/88c5b9f827779ae6fe5a6f08100a4b6184492a1c
machine2.execute("systemctl start virtlockd.socket && systemctl start virtlogd.socket")
martinpitt marked this conversation as resolved.
Show resolved Hide resolved

if fail != "authentication":
# setup key authentication
machine1.execute("mkdir -m 0700 -p /root/.ssh")
Expand Down
4 changes: 4 additions & 0 deletions test/machineslib.py
Expand Up @@ -98,6 +98,10 @@ def startLibvirt(self):

# Ensure everything has started correctly
m.execute(f"systemctl start {self.getLibvirtServiceName()}.service")
if m.image in ["fedora-35"]:
# HACK for missing deps on virtlockd/virtlogd sockets - needed till f-35 uses libvirt v7.7.0
# https://github.com/libvirt/libvirt/commit/88c5b9f827779ae6fe5a6f08100a4b6184492a1c
m.execute("systemctl start virtlockd.socket && systemctl start virtlogd.socket")

# Wait until we can get a list of domains
m.execute("until virsh list; do sleep 1; done")
Expand Down