Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ lint:
- ci/codecov-wrapper -F unittests

variables:
VM_IMAGE: qubes_4.3_64bit_stable.qcow2
VM_IMAGE: "qubesos:4.3"

needs:
- r4.3:build:host-fc41
- r4.3:build:vm-fc42
- r4.3:build:vm-fc43

r4.3:mgmt-host:
extends: .qubes-ansible-tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,15 @@
import tarfile
import tempfile
import traceback
import types

from multiprocessing.reduction import ForkingPickler
from pathlib import Path

# Ansible stores Role._hash as MappingProxyType. multiprocessing.Pool
# pickles task args through ForkingPickler and mappingproxy isn't picklable.
ForkingPickler.register(types.MappingProxyType, lambda mp: (dict, (dict(mp),)))

import qubesadmin
import qubesadmin.events.utils
import qubesadmin.exc
Expand Down Expand Up @@ -307,8 +313,14 @@ def _add_roles(self, play):
dest_roles_path = self.temp_dir / "roles"
dest_roles_path.mkdir()

# A play may list the same role multiple times with different
# `when:` conditions; only copy each role directory once.
seen = set()
for role in play.get_roles():
role_path = Path(role.get_role_path())
if role_path.name in seen:
continue
seen.add(role_path.name)
shutil.copytree(role_path, dest_roles_path / role_path.name)

def _add_rpc_policies(self, dispvm_name):
Expand Down Expand Up @@ -386,7 +398,7 @@ def _remove_rpc_policies(self, dispvm_name):
)

def _start_mgmt_disp_vm(self):
self.vvv("Lookup for dispvm_mgmt")
self.vvv(f"Lookup for dispvm_mgmt {self.dispvm_mgmt_name}")
dispvm = self.app.domains.get(self.dispvm_mgmt_name)
self.vvv(f"Found dispvm: {dispvm}")
if dispvm is None:
Expand Down Expand Up @@ -533,7 +545,7 @@ def proxy_run(self, iterator, play_context):
display.vvv(
f"<QubesOS> Running play {play} " f"with {self._tqm._forks} forks"
)
pool = multiprocessing.Pool(self._tqm._forks)
pool = multiprocessing.get_context("fork").Pool(self._tqm._forks)

self.qubes_results = {}
for host in self._inventory.get_hosts(play.hosts):
Expand Down
6 changes: 3 additions & 3 deletions ci/install_mgmtvm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ mgmtvm mgmtvm allow target=dom0
mgmtvm sys-net allow target=dom0
mgmtvm sys-firewall allow target=dom0
mgmtvm sys-usb allow target=dom0
mgmtvm fedora-42-xfce allow target=dom0
mgmtvm ${default_mgmt_dispvm_template} allow target=dom0
mgmtvm debian-13-xfce allow target=dom0
EOF

cat << EOF >> /etc/qubes/policy.d/include/admin-local-ro
mgmtvm sys-net allow target=dom0
mgmtvm sys-firewall allow target=dom0
mgmtvm sys-usb allow target=dom0
mgmtvm fedora-42-xfce allow target=dom0
mgmtvm ${default_mgmt_dispvm_template} allow target=dom0
mgmtvm debian-13-xfce allow target=dom0
EOF

Expand All @@ -66,7 +66,7 @@ admin.vm.Create.TemplateVM * mgmtvm dom0 allow

# You may want to allow the ManagementVM to clone some templates to create StandaloneVMs or new TemplateVMs
admin.vm.volume.CloneFrom * mgmtvm debian-13-xfce allow target=dom0
admin.vm.volume.CloneFrom * mgmtvm fedora-42-xfce allow target=dom0
admin.vm.volume.CloneFrom * mgmtvm ${default_mgmt_dispvm_template} allow target=dom0

# And to remove created ones
admin.vm.Remove * mgmtvm @tag:created-by-mgmtvm allow target=dom0
Expand Down