Fix: test_min_change_efi_azl4_qcow_output (on arm64) failing due to unavailable dracut-virtio (#722)

This PR fixes failing test `test_min_change_efi_azl4_qcow_output` by
removing `dracut-virtio` in the relevant config.

`dracut-virtio` is preinstalled on all azl3 VMs and is not needed for
azl4, so we can also simplify further the number of configs needed for
this class of tests.

Author: vinceaperri

test/vmtests/vmtests/imagecustomizer/test_min_change.py

@@ -208,10 +208,7 @@ def test_min_change_efi_azl3_qcow_output(
     close_list: List[Closeable],
 ) -> None:
     azl_release = 3
-    if platform.machine() == "x86_64":
-        config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-amd64-azl3.yaml")
-    else:
-        config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-arm64-azl3.yaml")
+    config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-azl3.yaml")
     output_format = "qcow2"
 
     run_min_change_test(
@@ -242,10 +239,7 @@ def test_min_change_efi_azl4_qcow_output(
     close_list: List[Closeable],
 ) -> None:
     azl_release = 4
-    if platform.machine() == "x86_64":
-        config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-amd64-azl4.yaml")
-    else:
-        config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-arm64-azl4.yaml")
+    config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-azl4.yaml")
     output_format = "qcow2"
 
     run_min_change_test(
@@ -309,7 +303,7 @@ def test_min_change_legacy_azl3_qcow_output(
     close_list: List[Closeable],
 ) -> None:
     azl_release = 3
-    config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-amd64-azl3.yaml")
+    config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-azl3.yaml")
     output_format = "qcow2"
 
     run_min_change_test(
@@ -341,7 +335,7 @@ def test_min_change_legacy_azl4_qcow_output(
     close_list: List[Closeable],
 ) -> None:
     azl_release = 4
-    config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-amd64-azl4.yaml")
+    config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-azl4.yaml")
     output_format = "qcow2"
 
     run_min_change_test(

test/vmtests/vmtests/osmodifier/test_osmodifier.py

@@ -3,7 +3,6 @@
 
 import logging
 import os
-import platform
 import tempfile
 from pathlib import Path
 from typing import List, Tuple
@@ -37,10 +36,7 @@ def setup_vm_with_osmodifier(
     libvirt_conn: libvirt.virConnect,
     session_close_list: List[Closeable],
 ) -> Tuple[SshClient, Path, Path]:
-    if platform.machine() == "x86_64":
-        config_path = TEST_CONFIGS_DIR.joinpath("osmodifier-vm-config.yaml")
-    else:
-        config_path = TEST_CONFIGS_DIR.joinpath("osmodifier-vm-config-arm64.yaml")
+    config_path = TEST_CONFIGS_DIR.joinpath("osmodifier-vm-config.yaml")
 
     output_format = "qcow2"
     ssh_public_key, ssh_private_key_path = ssh_key