KVM-test: Prepare two unattended files for ide and virtio_blk From: Amos Kong <[email protected]>
For Win2008-32/64/r2 guests, if we assign default path "C:" to unattended file, the unattended_install.cd will fail to parse xml file. This patch just prepare two unattended files for ide and virtio_blk, this fix is not so good, we need maintain more repeated unattended files. We don't need add new files if we put a large block of xml file to unattended.py, it's also not a prefect resolution. Signed-off-by: Amos Kong <[email protected]> --- client/tests/kvm/tests_base.cfg.sample | 47 +++-- .../kvm/unattended/win2008-32-autounattend.xml | 14 - .../unattended/win2008-32-virtio-autounattend.xml | 190 +++++++++++++++++++ .../kvm/unattended/win2008-64-autounattend.xml | 14 - .../unattended/win2008-64-virtio-autounattend.xml | 196 ++++++++++++++++++++ .../kvm/unattended/win2008-r2-autounattend.xml | 14 - .../unattended/win2008-r2-virtio-autounattend.xml | 196 ++++++++++++++++++++ 7 files changed, 614 insertions(+), 57 deletions(-) create mode 100644 client/tests/kvm/unattended/win2008-32-virtio-autounattend.xml create mode 100644 client/tests/kvm/unattended/win2008-64-virtio-autounattend.xml create mode 100644 client/tests/kvm/unattended/win2008-r2-virtio-autounattend.xml diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index fe3563c..4c93615 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -713,6 +713,18 @@ variants: ethtool: supported_features = "tx sg tso gso" + +# Blocks +variants: + - @ide: + drive_format=ide + - scsi: + drive_format=scsi + - virtio_blk: + drive_format=virtio + image_boot=yes + + # Guests variants: # Linux section @@ -1693,7 +1705,6 @@ variants: cdrom_cd1 = windows/Windows2008-x86.iso md5sum=0bfca49f0164de0a8eba236ced47007d md5sum_1m=07d7f5006393f74dc76e6e2e943e2440 - unattended_file = unattended/win2008-32-autounattend.xml floppy = images/win2008-sp1-32/answer.vfd # Uncomment virtio_network_installer_path line if # you have an msi installer, also make sure the @@ -1701,6 +1712,10 @@ variants: virtio_storage_path = 'F:\viostor\2k8\x86' virtio_network_path = 'F:\NetKVM\2k8\x86' #virtio_network_installer_path = 'F:\RHEV-Network32.msi' + ide: + unattended_file = unattended/win2008-32-autounattend.xml + virtio_blk: + unattended_file = unattended/win2008-32-virtio-autounattend.xml - sp2: image_name += -sp2-32 @@ -1710,7 +1725,6 @@ variants: md5sum_1m = b7a9d42e55ea1e85105a3a6ad4da8e04 sha1sum = 49d0d6917c1256fe81048d414fa473bbc76a8724 sha1sum_1m = 9662ff7ed715faa00407e4befc484ea52a92a9fb - unattended_file = unattended/win2008-32-autounattend.xml floppy = images/win2008-sp2-32/answer.vfd # Uncomment virtio_network_installer_path line if # you have an msi installer, also make sure the @@ -1718,6 +1732,10 @@ variants: virtio_storage_path = 'F:\viostor\2k8\x86' virtio_network_path = 'F:\NetKVM\2k8\x86' #virtio_network_installer_path = 'F:\RHEV-Network32.msi' + ide: + unattended_file = unattended/win2008-32-autounattend.xml + virtio_blk: + unattended_file = unattended/win2008-32-virtio-autounattend.xml - 64: variants: @@ -1737,7 +1755,6 @@ variants: cdrom_cd1 = windows/Windows2008-x64.iso md5sum=27c58cdb3d620f28c36333a5552f271c md5sum_1m=efdcc11d485a1ef9afa739cb8e0ca766 - unattended_file = unattended/win2008-64-autounattend.xml floppy = images/win2008-sp1-64/answer.vfd # Uncomment virtio_network_installer_path line if # you have an msi installer, also make sure the @@ -1745,6 +1762,10 @@ variants: virtio_storage_path = 'F:\viostor\2k8\amd64' virtio_network_path = 'F:\NetKVM\2k8\amd64' #virtio_network_installer_path = 'F:\RHEV-Network64.msi' + ide: + unattended_file = unattended/win2008-64-autounattend.xml + virtio_blk: + unattended_file = unattended/win2008-64-virtio-autounattend.xml - sp2: image_name += -sp2-64 @@ -1754,7 +1775,6 @@ variants: md5sum_1m = ee55506823d0efffb5532ddd88a8e47b sha1sum = 34c7d726c57b0f8b19ba3b40d1b4044c15fc2029 sha1sum_1m = 8fe08b03e3531906855a60a78020ac9577dff5ba - unattended_file = unattended/win2008-64-autounattend.xml floppy = images/win2008-sp2-64/answer.vfd # Uncomment virtio_network_installer_path line if # you have an msi installer, also make sure the @@ -1762,6 +1782,10 @@ variants: virtio_storage_path = 'F:\viostor\2k8\amd64' virtio_network_path = 'F:\NetKVM\2k8\amd64' #virtio_network_installer_path = 'F:\RHEV-Network64.msi' + ide: + unattended_file = unattended/win2008-64-autounattend.xml + virtio_blk: + unattended_file = unattended/win2008-64-virtio-autounattend.xml - r2: image_name += -r2-64 @@ -1771,7 +1795,6 @@ variants: md5sum_1m = a5a22ce25008bd7109f6d830d627e3ed sha1sum = ad855ea913aaec3f1d0e1833c1aef7a0de326b0a sha1sum_1m = 9194a3aabae25b36e5f73cad001314b2c8d07d14 - unattended_file = unattended/win2008-r2-autounattend.xml floppy = images/win2008-r2-64/answer.vfd # Uncomment virtio_network_installer_path line if # you have an msi installer, also make sure the @@ -1779,6 +1802,10 @@ variants: virtio_storage_path = 'F:\viostor\2k8\amd64' virtio_network_path = 'F:\NetKVM\2k8\amd64' #virtio_network_installer_path = 'F:\RHEV-Network64.msi' + ide: + unattended_file = unattended/win2008-r2-autounattend.xml + virtio_blk: + unattended_file = unattended/win2008-r2-virtio-autounattend.xml - Win7: image_name = win7 @@ -1910,16 +1937,6 @@ variants: timedrift.with_load: used_cpus = 100 -variants: - - @ide: - drive_format=ide - - scsi: - drive_format=scsi - - virtio_blk: - drive_format=virtio - image_boot=yes - - virtio_net|virtio_blk|e1000|balloon_check: only Fedora.11 Fedora.12 Fedora.13 RHEL.5 OpenSUSE.11 SLES.11 Ubuntu-8.10-server # only WinXP Win2003 Win2008 WinVista Win7 Fedora.11 Fedora.12 Fedora.13 RHEL.5 OpenSUSE.11 SLES.11 Ubuntu-8.10-server diff --git a/client/tests/kvm/unattended/win2008-32-autounattend.xml b/client/tests/kvm/unattended/win2008-32-autounattend.xml index a8fc9c5..d50701a 100644 --- a/client/tests/kvm/unattended/win2008-32-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-32-autounattend.xml @@ -15,20 +15,6 @@ <UILanguageFallback>en-us</UILanguageFallback> <UserLocale>en-us</UserLocale> </component> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" - processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" - language="neutral" versionScope="nonSxS" - xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <DriverPaths> - <PathAndCredentials wcm:keyValue="1" wcm:action="add"> - <Path>KVM_TEST_STORAGE_DRIVER_PATH</Path> - </PathAndCredentials> - <PathAndCredentials wcm:keyValue="2" wcm:action="add"> - <Path>KVM_TEST_NETWORK_DRIVER_PATH</Path> - </PathAndCredentials> - </DriverPaths> - </component> <component name="Microsoft-Windows-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" diff --git a/client/tests/kvm/unattended/win2008-32-virtio-autounattend.xml b/client/tests/kvm/unattended/win2008-32-virtio-autounattend.xml new file mode 100644 index 0000000..a8fc9c5 --- /dev/null +++ b/client/tests/kvm/unattended/win2008-32-virtio-autounattend.xml @@ -0,0 +1,190 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-International-Core-WinPE" + processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <SetupUILanguage> + <UILanguage>en-us</UILanguage> + </SetupUILanguage> + <InputLocale>0409:00010409</InputLocale> + <SystemLocale>en-us</SystemLocale> + <UILanguage>en-us</UILanguage> + <UILanguageFallback>en-us</UILanguageFallback> + <UserLocale>en-us</UserLocale> + </component> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" + processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <DriverPaths> + <PathAndCredentials wcm:keyValue="1" wcm:action="add"> + <Path>KVM_TEST_STORAGE_DRIVER_PATH</Path> + </PathAndCredentials> + <PathAndCredentials wcm:keyValue="2" wcm:action="add"> + <Path>KVM_TEST_NETWORK_DRIVER_PATH</Path> + </PathAndCredentials> + </DriverPaths> + </component> + <component name="Microsoft-Windows-Setup" + processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <DiskConfiguration> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>20000</Size> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Active>true</Active> + <Extend>false</Extend> + <Format>NTFS</Format> + <Label>OS_Install</Label> + <Letter>C</Letter> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + <WillShowUI>OnError</WillShowUI> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/INDEX</Key> + <Value>1</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>1</PartitionID> + </InstallTo> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <Key>KVM_TEST_CDKEY</Key> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Autotest Mindless Drone</FullName> + <Organization>Autotest</Organization> + </UserData> + <EnableFirewall>false</EnableFirewall> + <EnableNetwork>true</EnableNetwork> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-Deployment" + processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <Reseal> + <ForceShutdownNow>false</ForceShutdownNow> + </Reseal> + </component> + <component name="Microsoft-Windows-International-Core" + processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <InputLocale>0409:00000409</InputLocale> + <SystemLocale>en-us</SystemLocale> + <UILanguage>en-us</UILanguage> + <UILanguageFallback>en-us</UILanguageFallback> + <UserLocale>en-us</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" + processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <UserAccounts> + <AdministratorPassword> + <Value>1q2w3eP</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + </UserAccounts> + <AutoLogon> + <Password> + <Value>1q2w3eP</Value> + <PlainText>true</PlainText> + </Password> + <Username>Administrator</Username> + <LogonCount>5</LogonCount> + <Enabled>true</Enabled> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER"</CommandLine> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer"</CommandLine> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c sc config TlntSvr start= auto</CommandLine> + <Order>3</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine> + <Order>4</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine> + <Order>5</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine> + <Order>6</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine> + <Order>7</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine> + <Order>8</Order> + </SynchronousCommand> + </FirstLogonCommands> + <OOBE> + <ProtectYourPC>1</ProtectYourPC> + <NetworkLocation>Work</NetworkLocation> + </OOBE> + </component> + </settings> + <settings pass="auditSystem"> + <component name="Microsoft-Windows-Shell-Setup" + processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <AutoLogon> + <Password> + <Value>1q2w3eP</Value> + <PlainText>true</PlainText> + </Password> + <Username>Administrator</Username> + <LogonCount>1000</LogonCount> + <Enabled>true</Enabled> + </AutoLogon> + </component> + </settings> + <cpi:offlineImage + cpi:source="wim:d:/os/win2k8/i386/sources/install.wim#Windows Longhorn SERVERSTANDARD" + xmlns:cpi="urn:schemas-microsoft-com:cpi" /> +</unattend> diff --git a/client/tests/kvm/unattended/win2008-64-autounattend.xml b/client/tests/kvm/unattended/win2008-64-autounattend.xml index 98f5589..364f5bf 100644 --- a/client/tests/kvm/unattended/win2008-64-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-64-autounattend.xml @@ -70,20 +70,6 @@ <UserLocale>en-us</UserLocale> <UILanguageFallback>en-us</UILanguageFallback> </component> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" - processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" - language="neutral" versionScope="nonSxS" - xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <DriverPaths> - <PathAndCredentials wcm:keyValue="1" wcm:action="add"> - <Path>KVM_TEST_STORAGE_DRIVER_PATH</Path> - </PathAndCredentials> - <PathAndCredentials wcm:keyValue="2" wcm:action="add"> - <Path>KVM_TEST_NETWORK_DRIVER_PATH</Path> - </PathAndCredentials> - </DriverPaths> - </component> </settings> <settings pass="specialize"> <component name="Microsoft-Windows-Deployment" diff --git a/client/tests/kvm/unattended/win2008-64-virtio-autounattend.xml b/client/tests/kvm/unattended/win2008-64-virtio-autounattend.xml new file mode 100644 index 0000000..98f5589 --- /dev/null +++ b/client/tests/kvm/unattended/win2008-64-virtio-autounattend.xml @@ -0,0 +1,196 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-Setup" + processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <DiskConfiguration> + <WillShowUI>OnError</WillShowUI> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>20000</Size> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Active>true</Active> + <Extend>false</Extend> + <Format>NTFS</Format> + <Label>OS_Install</Label> + <Letter>C</Letter> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/INDEX</Key> + <Value>1</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>1</PartitionID> + </InstallTo> + <WillShowUI>OnError</WillShowUI> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <Key>KVM_TEST_CDKEY</Key> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Autotest Mindless Drone</FullName> + <Organization>Autotest</Organization> + </UserData> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" + processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <SetupUILanguage> + <UILanguage>en-us</UILanguage> + </SetupUILanguage> + <InputLocale>0409:00000409</InputLocale> + <SystemLocale>en-us</SystemLocale> + <UILanguage>en-us</UILanguage> + <UserLocale>en-us</UserLocale> + <UILanguageFallback>en-us</UILanguageFallback> + </component> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" + processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <DriverPaths> + <PathAndCredentials wcm:keyValue="1" wcm:action="add"> + <Path>KVM_TEST_STORAGE_DRIVER_PATH</Path> + </PathAndCredentials> + <PathAndCredentials wcm:keyValue="2" wcm:action="add"> + <Path>KVM_TEST_NETWORK_DRIVER_PATH</Path> + </PathAndCredentials> + </DriverPaths> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-Deployment" + processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <RunSynchronous> + <RunSynchronousCommand wcm:action="add"> + <Description>EnableAdmin</Description> + <Order>1</Order> + <Path>cmd /c net user Administrator /active:yes</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Description>UnfilterAdministratorToken</Description> + <Order>2</Order> + <Path>cmd /c reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System /v FilterAdministratorToken /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + </RunSynchronous> + </component> + <component name="Microsoft-Windows-International-Core" + processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <InputLocale>0409:00000409</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-Shell-Setup" + processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <UserAccounts> + <AdministratorPassword> + <Value>1q2w3eP</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + </UserAccounts> + <AutoLogon> + <Password> + <Value>1q2w3eP</Value> + <PlainText>true</PlainText> + </Password> + <Enabled>true</Enabled> + <LogonCount>1000</LogonCount> + <Username>Administrator</Username> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER"</CommandLine> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer"</CommandLine> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c sc config TlntSvr start= auto</CommandLine> + <Order>3</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine> + <Order>4</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine> + <Order>5</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine> + <Order>6</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine> + <Order>7</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine> + <Order>8</Order> + </SynchronousCommand> + </FirstLogonCommands> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>1</ProtectYourPC> + <SkipUserOOBE>true</SkipUserOOBE> + <SkipMachineOOBE>true</SkipMachineOOBE> + </OOBE> + </component> + <component name="Microsoft-Windows-International-Core" + processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <InputLocale>0409:00000409</InputLocale> + <SystemLocale>en-us</SystemLocale> + <UILanguage>en-us</UILanguage> + <UILanguageFallback>en-us</UILanguageFallback> + <UserLocale>en-us</UserLocale> + </component> + </settings> + <cpi:offlineImage + cpi:source="wim:d:/os/vista/x64/sources/install.wim#Windows Vista ENTERPRISE" + xmlns:cpi="urn:schemas-microsoft-com:cpi" /> +</unattend> diff --git a/client/tests/kvm/unattended/win2008-r2-autounattend.xml b/client/tests/kvm/unattended/win2008-r2-autounattend.xml index 98f5589..364f5bf 100644 --- a/client/tests/kvm/unattended/win2008-r2-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-r2-autounattend.xml @@ -70,20 +70,6 @@ <UserLocale>en-us</UserLocale> <UILanguageFallback>en-us</UILanguageFallback> </component> - <component name="Microsoft-Windows-PnpCustomizationsWinPE" - processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" - language="neutral" versionScope="nonSxS" - xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <DriverPaths> - <PathAndCredentials wcm:keyValue="1" wcm:action="add"> - <Path>KVM_TEST_STORAGE_DRIVER_PATH</Path> - </PathAndCredentials> - <PathAndCredentials wcm:keyValue="2" wcm:action="add"> - <Path>KVM_TEST_NETWORK_DRIVER_PATH</Path> - </PathAndCredentials> - </DriverPaths> - </component> </settings> <settings pass="specialize"> <component name="Microsoft-Windows-Deployment" diff --git a/client/tests/kvm/unattended/win2008-r2-virtio-autounattend.xml b/client/tests/kvm/unattended/win2008-r2-virtio-autounattend.xml new file mode 100644 index 0000000..98f5589 --- /dev/null +++ b/client/tests/kvm/unattended/win2008-r2-virtio-autounattend.xml @@ -0,0 +1,196 @@ +<?xml version="1.0" encoding="utf-8"?> +<unattend xmlns="urn:schemas-microsoft-com:unattend"> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-Setup" + processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <DiskConfiguration> + <WillShowUI>OnError</WillShowUI> + <Disk wcm:action="add"> + <CreatePartitions> + <CreatePartition wcm:action="add"> + <Order>1</Order> + <Size>20000</Size> + <Type>Primary</Type> + </CreatePartition> + </CreatePartitions> + <ModifyPartitions> + <ModifyPartition wcm:action="add"> + <Active>true</Active> + <Extend>false</Extend> + <Format>NTFS</Format> + <Label>OS_Install</Label> + <Letter>C</Letter> + <Order>1</Order> + <PartitionID>1</PartitionID> + </ModifyPartition> + </ModifyPartitions> + <DiskID>0</DiskID> + <WillWipeDisk>true</WillWipeDisk> + </Disk> + </DiskConfiguration> + <ImageInstall> + <OSImage> + <InstallFrom> + <MetaData wcm:action="add"> + <Key>/IMAGE/INDEX</Key> + <Value>1</Value> + </MetaData> + </InstallFrom> + <InstallTo> + <DiskID>0</DiskID> + <PartitionID>1</PartitionID> + </InstallTo> + <WillShowUI>OnError</WillShowUI> + </OSImage> + </ImageInstall> + <UserData> + <ProductKey> + <Key>KVM_TEST_CDKEY</Key> + <WillShowUI>OnError</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <FullName>Autotest Mindless Drone</FullName> + <Organization>Autotest</Organization> + </UserData> + </component> + <component name="Microsoft-Windows-International-Core-WinPE" + processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <SetupUILanguage> + <UILanguage>en-us</UILanguage> + </SetupUILanguage> + <InputLocale>0409:00000409</InputLocale> + <SystemLocale>en-us</SystemLocale> + <UILanguage>en-us</UILanguage> + <UserLocale>en-us</UserLocale> + <UILanguageFallback>en-us</UILanguageFallback> + </component> + <component name="Microsoft-Windows-PnpCustomizationsWinPE" + processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <DriverPaths> + <PathAndCredentials wcm:keyValue="1" wcm:action="add"> + <Path>KVM_TEST_STORAGE_DRIVER_PATH</Path> + </PathAndCredentials> + <PathAndCredentials wcm:keyValue="2" wcm:action="add"> + <Path>KVM_TEST_NETWORK_DRIVER_PATH</Path> + </PathAndCredentials> + </DriverPaths> + </component> + </settings> + <settings pass="specialize"> + <component name="Microsoft-Windows-Deployment" + processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <RunSynchronous> + <RunSynchronousCommand wcm:action="add"> + <Description>EnableAdmin</Description> + <Order>1</Order> + <Path>cmd /c net user Administrator /active:yes</Path> + </RunSynchronousCommand> + <RunSynchronousCommand wcm:action="add"> + <Description>UnfilterAdministratorToken</Description> + <Order>2</Order> + <Path>cmd /c reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System /v FilterAdministratorToken /t REG_DWORD /d 0 /f</Path> + </RunSynchronousCommand> + </RunSynchronous> + </component> + <component name="Microsoft-Windows-International-Core" + processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <InputLocale>0409:00000409</InputLocale> + <SystemLocale>en-US</SystemLocale> + <UILanguage>en-US</UILanguage> + <UserLocale>en-US</UserLocale> + </component> + </settings> + <settings pass="oobeSystem"> + <component name="Microsoft-Windows-Shell-Setup" + processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <UserAccounts> + <AdministratorPassword> + <Value>1q2w3eP</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + </UserAccounts> + <AutoLogon> + <Password> + <Value>1q2w3eP</Value> + <PlainText>true</PlainText> + </Password> + <Enabled>true</Enabled> + <LogonCount>1000</LogonCount> + <Username>Administrator</Username> + </AutoLogon> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER"</CommandLine> + <Order>1</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer"</CommandLine> + <Order>2</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c sc config TlntSvr start= auto</CommandLine> + <Order>3</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine> + <Order>4</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine> + <Order>5</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine> + <Order>6</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine> + <Order>7</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine> + <Order>8</Order> + </SynchronousCommand> + </FirstLogonCommands> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>1</ProtectYourPC> + <SkipUserOOBE>true</SkipUserOOBE> + <SkipMachineOOBE>true</SkipMachineOOBE> + </OOBE> + </component> + <component name="Microsoft-Windows-International-Core" + processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" + language="neutral" versionScope="nonSxS" + xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <InputLocale>0409:00000409</InputLocale> + <SystemLocale>en-us</SystemLocale> + <UILanguage>en-us</UILanguage> + <UILanguageFallback>en-us</UILanguageFallback> + <UserLocale>en-us</UserLocale> + </component> + </settings> + <cpi:offlineImage + cpi:source="wim:d:/os/vista/x64/sources/install.wim#Windows Vista ENTERPRISE" + xmlns:cpi="urn:schemas-microsoft-com:cpi" /> +</unattend> _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
