Skip to content

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

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.

Sign up for GitHub

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

Open
vinceaperri wants to merge 1 commit into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 10 deletions test/vmtests/vmtests/imagecustomizer/test_min_change.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down
6 changes: 1 addition & 5 deletions test/vmtests/vmtests/osmodifier/test_osmodifier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

import logging
import os
import platform
import tempfile
from pathlib import Path
from typing import List, Tuple
Expand Down Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions toolkit/tools/pkg/imagecustomizerlib/testdata/os-vm-config-arm64-azl3.yaml
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions toolkit/tools/pkg/imagecustomizerlib/testdata/os-vm-config-arm64-azl4.yaml
View file
Open in desktop

This file was deleted.

0 ...lib/testdata/os-vm-config-amd64-azl3.yaml → ...omizerlib/testdata/os-vm-config-azl3.yaml
View file
Open in desktop
File renamed without changes.
0 ...lib/testdata/os-vm-config-amd64-azl4.yaml → ...omizerlib/testdata/os-vm-config-azl4.yaml
View file
Open in desktop
File renamed without changes.
0 ...zerlib/testdata/osmodifier-vm-config.yaml → ...b/testdata/osmodifier-vm-config-azl3.yaml
View file
Open in desktop
File renamed without changes.
5 changes: 1 addition & 4 deletions .../testdata/osmodifier-vm-config-arm64.yaml → ...b/testdata/osmodifier-vm-config-azl4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
# Differs from osmodifier-vm-config-azl3 its removal of selinux-policy-modules
os:
additionalFiles:
# Enable DHCP client on all of the physical NICs.
- source: files/89-ethernet.network
destination: /etc/systemd/network/89-ethernet.network
packages:
install:
- dracut-virtio
packages:
install:
- selinux-policy
- selinux-policy-modules
- setools-console
- policycoreutils-python-utils
Loading