Skip to content
Open
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
14 changes: 3 additions & 11 deletions avocado-setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ def env_check(enable_kvm):
logger.info("Check for environment")
not_found = []
(env_ver, env_type, cmd_pat) = helper.get_env_type(enable_kvm)
# try to check base packages using major version numbers
env_ver_full = env_ver.replace('.', '_') # Full version with underscore
env_ver_major = env_ver.split('.')[0]
# Derive major and full version identifiers
env_ver_full = env_ver.replace('.', '_') # e.g., sles16_1
env_ver_major = env_ver.split('.')[0] # e.g., sles16
env_deps = []
# Try full version first (e.g., deps_sles16_1)
if CONFIGFILE.has_section('deps_%s' % env_ver_full):
Expand All @@ -151,14 +151,6 @@ def env_check(enable_kvm):
packages = CONFIGFILE.get('deps_%s' % env_ver_major, 'packages')
if packages != '':
env_deps = packages.split(',')
else:
# Fallback to base name if specific version is not found
dist = helper.get_dist()
env_ver_major = dist[0]
if CONFIGFILE.has_section('deps_%s' % env_ver_major):
packages = CONFIGFILE.get('deps_%s' % env_ver_major, 'packages')
if packages != '':
env_deps = packages.split(',')

for dep in env_deps:
if dep[-1] == "$":
Expand Down
6 changes: 5 additions & 1 deletion config/tests/guest/libvirt/network.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ variants:
only virsh.net_info
- net_virsh_net_list:
only virsh.net_list
- net_virsh_net_event:
- net_virsh_net_event:
only virsh.net_event
- net_virsh_net_name:
only virsh.net_name
Expand Down Expand Up @@ -108,6 +108,8 @@ variants:
- net_virsh_domiflist:
only virsh.domiflist
- net_virsh_domif_setlink_getlink:
create_vm_libvirt=no
kill_vm_libvirt=no
only virsh.domif_setlink_getlink
- net_virtual_network.iface_ovs:
only virtual_network.iface_ovs
Expand Down Expand Up @@ -157,6 +159,8 @@ variants:
no virtual_network.iface_network.net_portgroup.specific_portgroup
no virtual_network.iface_network.net_portgroup.overwriting_bandwidth
- net_virtual_network_iface_options:
create_vm_libvirt=no
kill_vm_libvirt=no
only virtual_network.iface_options
no virtual_network.iface_options.iface_macvtap.driver_qemu.mode_bridge
no virtual_network.iface_options.iface_macvtap.driver_qemu.mode_passthrough
Expand Down
2 changes: 1 addition & 1 deletion config/tests/guest/libvirt/pci_passthrough.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ variants:
- hotplug_hotunplug_passthrough:
only libvirt_pci_passthrough_hotplug

- pci_passthrough_eeh:
- pci_passthrough_eeh:
only libvirt_pci_passthrough_eeh

- guest_remove:
Expand Down
4 changes: 2 additions & 2 deletions config/wrapper/env.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ post_script_dir = 'config/postscript'
# ('avocado-framework', 'git+https://github.com/avocado-framework/avocado.git@branch') -- Install version from the given git repo and checkout to specific branch
# ('avocado-framework-plugin-varianter-yaml-to-mux',
# 'git+https://github.com/avocado-framework/avocado.git#subdirectory=optional_plugins/varianter_yaml_to_mux') -- Install from subdirectory from the given git repo
base = [('avocado-framework', ''), ('avocado-framework-plugin-varianter-yaml-to-mux', ''), ('aautils', '')]
kvm = [('avocado-framework-plugin-vt', 'git+https://github.com/avocado-framework/avocado-vt.git')]
base = [('avocado-framework', ''), ('avocado-framework-plugin-varianter-yaml-to-mux', '')]
kvm = [('avocado-framework-plugin-vt', 'git+https://github.com/lop-devops/avocado-vt.git@KVMCI')]
optional = [('avocado-framework-plugin-result-html', '')]

[tests]
Expand Down