add fedora42 vmtests

Author: himaja-kesari

.github/workflows/tests-vmtests-imagecreator.yml

@@ -119,8 +119,10 @@ jobs:
       run: |
         set -eux
 
-        # Download the test RPM and tools file.
-        ./repo/toolkit/tools/internal/testutils/testrpms/download-test-utils.sh -t 3.0 -s true
+        # Download the test RPM and tools file for azurelinux
+        ./repo/toolkit/tools/internal/testutils/testrpms/download-test-utils.sh -d azurelinux -t 3.0 -s true
+        # Download the test RPM and tools file for fedora
+        ./repo/toolkit/tools/internal/testutils/testrpms/download-test-utils.sh -d fedora -t 42 -s true
 
 
     - name: Run image creator tests
@@ -129,13 +131,20 @@ jobs:
 
         pushd ./repo/test/vmtests
 
-        sudo make test-imagecreator \
+        sudo make test-imagecreator-azurelinux \
           IMAGE_CREATOR_BIN="../../toolkit/out/tools/imagecreator" \
           TOOLS_TAR="../../toolkit/tools/internal/testutils/testrpms/build/tools-azurelinux-3.0.tar.gz" \
           RPM_SOURCES="../../toolkit/tools/internal/testutils/testrpms/downloadedrpms/azurelinux/3.0" \
           IMAGE_CUSTOMIZER_BINARY_PATH="../../toolkit/out/tools/imagecustomizer" \
           SSH_PRIVATE_KEY_FILE=~/.ssh/id_ed25519
 
+        sudo make test-imagecreator-fedora \
+          IMAGE_CREATOR_BIN="../../toolkit/out/tools/imagecreator" \
+          TOOLS_TAR="../../toolkit/tools/internal/testutils/testrpms/build/tools-fedora-42.tar.gz" \
+          RPM_SOURCES="../../toolkit/tools/internal/testutils/testrpms/downloadedrpms/fedora/42" \
+          IMAGE_CUSTOMIZER_BINARY_PATH="../../toolkit/out/tools/imagecustomizer" \
+          SSH_PRIVATE_KEY_FILE=~/.ssh/id_ed25519  
+
     - uses: actions/upload-artifact@v4
       if: ${{ !cancelled() }}
       with:

test/vmtests/Makefile

@@ -99,8 +99,26 @@ test-imagecustomizer:
 		--junitxml=./out/$(DATETIME_AS_VERSION)/report.xml \
 		./vmtests/imagecustomizer/test_min_change.py
 
-.PHONY: test-imagecreator
-test-imagecreator:
+.PHONY: test-osmodifier
+test-osmodifier:
+	${PYTEST} \
+		--image-customizer-container-url="${IMAGE_CUSTOMIZER_CONTAINER_TAG}" \
+		--osmodifier-binary="${OSMODIFIER_BIN}" \
+		--logs-dir="${LOGS_DIR}" \
+		--input-image="${INPUT_IMAGE}" \
+		--ssh-private-key="${SSH_PRIVATE_KEY_FILE}" \
+		$(if $(filter y,$(KEEP_ENVIRONMENT)),--keep-environment) \
+		--log-cli-level=DEBUG \
+		--show-capture=all \
+		--tb=short \
+		--junitxml=./out/$(DATETIME_AS_VERSION)/report.xml \
+		./vmtests/osmodifier/test_osmodifier.py
+
+.PHONY: run-imagecustomizer
+run-imagecustomizer: image-customizer-container test-imagecustomizer
+
+.PHONY: test-imagecreator-azurelinux
+test-imagecreator-azurelinux:
 	${PYTEST} \
 		--image-creator-binary-path="${IMAGE_CREATOR_BIN}" \
 		--rpm-sources="${RPM_SOURCES}" \
@@ -114,26 +132,23 @@ test-imagecreator:
 		--junitxml=./out/$(DATETIME_AS_VERSION)/report.xml \
 		./vmtests/imagecreator/test_imagecreator.py
 
-.PHONY: test-osmodifier
-test-osmodifier:
+.PHONY: test-imagecreator-fedora
+test-imagecreator-fedora:
 	${PYTEST} \
-		--image-customizer-container-url="${IMAGE_CUSTOMIZER_CONTAINER_TAG}" \
-		--osmodifier-binary="${OSMODIFIER_BIN}" \
-		--logs-dir="${LOGS_DIR}" \
-		--input-image="${INPUT_IMAGE}" \
+		--image-creator-binary-path="${IMAGE_CREATOR_BIN}" \
+		--rpm-sources="${RPM_SOURCES}" \
+		--tools-tar="${TOOLS_TAR}" \
+		--image-customizer-binary-path="${IMAGE_CUSTOMIZER_BINARY_PATH}" \
 		--ssh-private-key="${SSH_PRIVATE_KEY_FILE}" \
 		$(if $(filter y,$(KEEP_ENVIRONMENT)),--keep-environment) \
 		--log-cli-level=DEBUG \
 		--show-capture=all \
 		--tb=short \
 		--junitxml=./out/$(DATETIME_AS_VERSION)/report.xml \
-		./vmtests/osmodifier/test_osmodifier.py
-
-.PHONY: run-imagecustomizer
-run-imagecustomizer: image-customizer-container test-imagecustomizer
+		./vmtests/imagecreator/test_imagecreator_fedora.py
 
 .PHONY: run-imagecreator
-run-imagecreator: ${IMAGE_CREATOR_BIN} test-imagecreator
+run-imagecreator: ${IMAGE_CREATOR_BIN} test-imagecreator-azurelinux test-imagecreator-fedora
 
 .PHONY: run-osmodifier
 run-osmodifier: ${OSMODIFIER_BIN} test-osmodifier

test/vmtests/vmtests/imagecreator/test_imagecreator.py

@@ -89,6 +89,11 @@ def run_image_creator_test(
     base_ssh_config_path = IMAGECREATOR_TEST_CONFIGS_DIR.joinpath("ssh-base-config.yaml")
     customizer_config_path_obj = add_ssh_to_config(base_ssh_config_path, username, ssh_public_key, close_list)
 
+    # add previewFeatures section if distro is Fedora
+    if distro.lower() == "fedora":
+        with open(customizer_config_path_obj, "a") as config_fd:
+            config_fd.write("\npreviewFeatures:\n  - fedora-42\n")  # Assuming Fedora 42 for this test
+
     run_image_customizer_binary(
         image_customizer_binary_path,
         initial_output_image_path,
@@ -185,36 +190,95 @@ def run_image_creator_test(
     logging.info(f"Attempting to connect to VM via SSH")
     logging.info(f"Username: {username}")
 
-    with vm.create_ssh_client(ssh_private_key_path, test_temp_dir, username) as ssh_client:
-        logging.info(f"SSH connection established successfully!")
-        # Run the test
-        logging.info(f"Running basic checks on the VM")
-        run_basic_checks(ssh_client, test_temp_dir)
-        logging.info(f"Basic checks completed successfully!")
+    try:
+        with vm.create_ssh_client(ssh_private_key_path, test_temp_dir, username) as ssh_client:
+            logging.info("SSH connection established successfully!")
+            # Test SSH connectivity and shell access
+            result = ssh_client.run("whoami")
+            if result.exit_code != 0:
+                logging.error("Failed to execute basic SSH command")
+                logging.error(f"Command output: {result.stdout}")
+                logging.error(f"Command error: {result.stderr}")
+                raise RuntimeError("SSH connection test failed")
+
+            # Run the test
+            logging.info("Running basic checks on the VM")
+            run_basic_checks(ssh_client, test_temp_dir)
+            logging.info("Basic checks completed successfully!")
+    except Exception as e:
+        logging.error(f"Failed to establish or verify SSH connection: {str(e)}")
+        logging.error("VM Console output:")
+        with open(vm_console_log_file_path, "r") as f:
+            logging.error(f.read())
+        raise
 
 
 def run_basic_checks(
     ssh_client: SshClient,
     test_temp_dir: Path,
 ) -> None:
+    """Run basic checks on the VM to verify the OS installation.
 
+    The checks are distro-specific based on the os-release file content.
+    """
     ssh_client.run("cat /proc/cmdline").check_exit_code()
 
     os_release_path = test_temp_dir.joinpath("os-release")
     ssh_client.get_file(Path("/etc/os-release"), os_release_path)
 
     with open(os_release_path, "r") as os_release_fd:
         os_release_text = os_release_fd.read()
-
-        # Since imagecreator creates new images, we expect Azure Linux 3.0
-        assert "ID=azurelinux" in os_release_text
-        assert 'VERSION_ID="3.0"' in os_release_text
-
-    # Check that essential packages are installed
-    ssh_client.run("rpm -q kernel").check_exit_code()
-    ssh_client.run("rpm -q systemd").check_exit_code()
-    ssh_client.run("rpm -q grub2").check_exit_code()
-    ssh_client.run("rpm -q bash").check_exit_code()
+        logging.info("OS Release content:")
+        logging.info(os_release_text)
+
+        # Determine which distro we're testing
+        if "ID=fedora" in os_release_text:
+            # Fedora specific checks
+            assert "ID=fedora" in os_release_text
+            assert 'VERSION="42 (Adams)"' in os_release_text
+        elif "ID=azurelinux" in os_release_text:
+            # Azure Linux specific checks
+            assert "ID=azurelinux" in os_release_text
+            assert 'VERSION_ID="3.0"' in os_release_text
+        else:
+            raise AssertionError(f"Unknown distribution found in os-release:\n{os_release_text}")
+
+    # Check that essential packages are installed - common for both distros
+    logging.info("Checking essential packages...")
+
+    # Check packages one by one with error logging
+    packages_to_check = ["kernel", "systemd", "bash"]
+    for package in packages_to_check:
+        logging.info(f"Checking package: {package}")
+        result = ssh_client.run(f"rpm -q {package}")
+        try:
+            result.check_exit_code()
+        except Exception as e:
+            logging.error(f"Failed to verify package {package}: {str(e)}")
+            logging.error(f"Command output: {result.stdout}")
+            logging.error(f"Command error: {result.stderr}")
+            raise
+
+    # Special handling for grub2 as package name might differ between distros
+    logging.info("Checking bootloader packages...")
+    if "ID=fedora" in os_release_text:
+        # Fedora might use grub2-pc or grub2-efi
+        try:
+            result = ssh_client.run("rpm -q grub2-efi-x64")
+            result.check_exit_code()
+        except Exception:
+            logging.warning("grub2-efi-x64 not found, trying grub2-pc...")
+            result = ssh_client.run("rpm -q grub2-pc")
+            try:
+                result.check_exit_code()
+            except Exception as e:
+                logging.error(f"Failed to find any grub2 package: {str(e)}")
+                logging.error(f"Command error: {result.stderr}")
+                raise
+    else:
+        # Azure Linux check
+        result = ssh_client.run("rpm -q grub2")
+        result.check_exit_code()
 
 
 @pytest.mark.skipif(platform.machine() != "x86_64", reason="arm64 is not supported for this combination")

test/vmtests/vmtests/imagecreator/test_imagecreator_fedora.py

@@ -0,0 +1,50 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+import logging
+import platform
+from pathlib import Path
+from typing import List, Tuple
+
+import libvirt  # type: ignore
+import pytest
+
+from ..utils.closeable import Closeable
+from .test_imagecreator import IMAGECREATOR_TEST_CONFIGS_DIR, run_image_creator_test
+
+
+@pytest.mark.skipif(platform.machine() != "x86_64", reason="arm64 is not supported for this combination")
+def test_create_image_efi_qcow_output_fedora(
+    image_creator_binary_path: Path,
+    rpm_sources: List[Path],
+    tools_tar: Path,
+    ssh_key: Tuple[str, Path],
+    test_temp_dir: Path,
+    test_instance_name: str,
+    logs_dir: Path,
+    libvirt_conn: libvirt.virConnect,
+    close_list: List[Closeable],
+    image_customizer_binary_path: Path,
+) -> None:
+    config_path = IMAGECREATOR_TEST_CONFIGS_DIR.joinpath("fedora.yaml")
+    output_format = "qcow2"
+
+    # debug message
+    logging.debug("Running test_create_image_efi_qcow_output_fedora")
+
+    run_image_creator_test(
+        image_creator_binary_path,
+        rpm_sources,
+        tools_tar,
+        config_path,
+        output_format,
+        ssh_key,
+        test_temp_dir,
+        test_instance_name,
+        logs_dir,
+        libvirt_conn,
+        close_list,
+        image_customizer_binary_path,
+        "fedora",
+        "42",
+    )

toolkit/tools/pkg/imagecreatorlib/testdata/fedora.yaml

@@ -49,4 +49,6 @@ os:
     - libxkbcommon
     - shim-x64
     - kernel
+    # Add dnf to support dnf based package installation in imagecustomizer
+    - dnf