Added VM tests for full-os initramfs.

Author: gmileka

test/vmtests/vmtests/test_min_change.py

@@ -283,7 +283,7 @@ def test_min_change_efi_azl2_iso_output(
     close_list: List[Closeable],
 ) -> None:
     azl_release = 2
-    config_path = TEST_CONFIGS_DIR.joinpath("iso-os-vm-config.yaml")
+    config_path = TEST_CONFIGS_DIR.joinpath("iso-bootstrap-vm.yaml")
     output_format = "iso"
 
     run_min_change_test(
@@ -314,7 +314,7 @@ def test_min_change_efi_azl3_iso_output(
     close_list: List[Closeable],
 ) -> None:
     azl_release = 3
-    config_path = TEST_CONFIGS_DIR.joinpath("iso-os-vm-config.yaml")
+    config_path = TEST_CONFIGS_DIR.joinpath("iso-bootstrap-vm.yaml")
     output_format = "iso"
 
     run_min_change_test(
@@ -332,6 +332,23 @@ def test_min_change_efi_azl3_iso_output(
         close_list,
     )
 
+    config_path = TEST_CONFIGS_DIR.joinpath("iso-full-os-vm.yaml")
+
+    run_min_change_test(
+        docker_client,
+        image_customizer_container_url,
+        core_efi_azl3,
+        azl_release,
+        config_path,
+        output_format,
+        ssh_key,
+        test_temp_dir,
+        test_instance_name,
+        logs_dir,
+        libvirt_conn,
+        close_list,
+    )
+
 
 @pytest.mark.skipif(platform.machine() != 'x86_64', reason="arm64 is not supported for this combination")
 def test_min_change_legacy_azl2_iso_output(
@@ -346,7 +363,7 @@ def test_min_change_legacy_azl2_iso_output(
     close_list: List[Closeable],
 ) -> None:
     azl_release = 2
-    config_path = TEST_CONFIGS_DIR.joinpath("iso-os-vm-config.yaml")
+    config_path = TEST_CONFIGS_DIR.joinpath("iso-bootstrap-vm.yaml")
     output_format = "iso"
 
     run_min_change_test(
@@ -378,7 +395,7 @@ def test_min_change_legacy_azl3_iso_output(
     close_list: List[Closeable],
 ) -> None:
     azl_release = 3
-    config_path = TEST_CONFIGS_DIR.joinpath("iso-os-vm-config.yaml")
+    config_path = TEST_CONFIGS_DIR.joinpath("iso-bootstrap-vm.yaml")
     output_format = "iso"
 
     run_min_change_test(

toolkit/tools/pkg/imagecustomizerlib/liveosisobuilder_test.go

@@ -13,8 +13,8 @@ import (
 
 	"github.com/microsoft/azurelinux/toolkit/tools/imagecustomizerapi"
 	"github.com/microsoft/azurelinux/toolkit/tools/internal/file"
-	"github.com/microsoft/azurelinux/toolkit/tools/internal/logger"
 	"github.com/microsoft/azurelinux/toolkit/tools/internal/initrdutils"
+	"github.com/microsoft/azurelinux/toolkit/tools/internal/logger"
 	"github.com/microsoft/azurelinux/toolkit/tools/internal/safeloopback"
 	"github.com/microsoft/azurelinux/toolkit/tools/internal/safemount"
 	"github.com/microsoft/azurelinux/toolkit/tools/internal/tarutils"
@@ -184,15 +184,15 @@ func VerifyFullOSContents(t *testing.T, testTempDir, artifactsPath, outputFormat
 				return
 			}
 			defer isoImageLoopDevice.Close()
-		
+
 			isoMountDir := filepath.Join(testTempDir, "bootstrap-iso-mount")
 			isoImageMount, err := safemount.NewMount(isoImageLoopDevice.DevicePath(), isoMountDir,
 				"iso9660" /*fstype*/, unix.MS_RDONLY /*flags*/, "" /*data*/, true /*makeAndDelete*/)
 			if !assert.NoError(t, err) {
 				return
 			}
 			defer isoImageMount.Close()
-			
+
 			fullOSImagePath = filepath.Join(isoMountDir, liveOSDir, liveOSImage)
 		}
 
@@ -208,16 +208,16 @@ func VerifyFullOSContents(t *testing.T, testTempDir, artifactsPath, outputFormat
 		if !assert.NoError(t, err) {
 			return
 		}
-		defer squashfsMount.Close()		
+		defer squashfsMount.Close()
 	case imagecustomizerapi.InitramfsImageTypeFullOS:
 		fullOSImagePath := filepath.Join(artifactsPath, "boot/initrd.img")
 		// Expand initrd to a folder
 		err := initrdutils.CreateFolderFromInitrdImage(fullOSImagePath, fullOsDir)
 		if !assert.NoError(t, err) {
 			return
 		}
-		defer os.RemoveAll(fullOsDir)		
-	}	
+		defer os.RemoveAll(fullOsDir)
+	}
 
 	// Check that each file is in the root file system.
 	for _, additionalFile := range osConfig.AdditionalFiles {
@@ -382,7 +382,7 @@ func TestCustomizeImageLiveOSInitramfs2(t *testing.T) {
 	if !assert.NoError(t, err) {
 		return
 	}
-		
+
 	ValidateIsoContent(t, configB, testTempDir, imagecustomizerapi.InitramfsImageTypeFullOS, outImageFilePath)
 
 	// - ISO {full-os} to ISO {bootstrap}, with selinux enforcing
@@ -395,7 +395,7 @@ func TestCustomizeImageLiveOSInitramfs2(t *testing.T) {
 		return
 	}
 
-	ValidateIsoContent(t, configC, testTempDir, imagecustomizerapi.InitramfsImageTypeBootstrap, outImageFilePath)	
+	ValidateIsoContent(t, configC, testTempDir, imagecustomizerapi.InitramfsImageTypeBootstrap, outImageFilePath)
 }
 
 // Tests:

toolkit/tools/pkg/imagecustomizerlib/liveosisoutils.go

@@ -32,8 +32,6 @@ const (
 	isoGrubCfg     = "grub.cfg"
 	isoGrubCfgPath = grubCfgDir + "/" + isoGrubCfg
 
-	pxeGrubCfg = "grub-pxe.cfg"
-
 	isoBootDir  = "boot"
 	initrdImage = "initrd.img"
 

…omizerlib/testdata/iso-os-vm-config.yaml …omizerlib/testdata/iso-bootstrap-vm.yamltoolkit/tools/pkg/imagecustomizerlib/testdata/iso-os-vm-config.yaml renamed to toolkit/tools/pkg/imagecustomizerlib/testdata/iso-bootstrap-vm.yaml toolkit/tools/pkg/imagecustomizerlib/testdata/iso-os-vm-config.yaml renamed to toolkit/tools/pkg/imagecustomizerlib/testdata/iso-bootstrap-vm.yaml

@@ -1,3 +1,5 @@
+iso:
+  initramfsType: full-os
 os:
   selinux:
     mode: disabled

toolkit/tools/pkg/imagecustomizerlib/testdata/iso-full-os-vm.yaml

@@ -0,0 +1,20 @@
+iso:
+  initramfsType: bootstrap
+os:
+  selinux:
+    mode: disabled
+  kernelCommandLine:
+    extraCommandLine:
+    - "selinux=0"
+  packages:
+    install:
+    # iso required packages
+    - squashfs-tools
+    - tar
+    - device-mapper
+    - curl
+
+  additionalFiles:
+    # Enable DHCP client on all of the physical NICs.
+  - source: files/89-ethernet.network
+    destination: /etc/systemd/network/89-ethernet.network