Replay sidestream changes
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
2021-04-10 15:32:31 +02:00
parent e455419986
commit 00557e50f9
15 changed files with 448 additions and 369 deletions

View File

@ -31,21 +31,11 @@
<TimeZone>UTC</TimeZone>
<UserAccounts>
<AdministratorPassword>
<Value>secret</Value>
<Value><<img-password>></Value>
<PlainText>true</PlainText>
</AdministratorPassword>
</UserAccounts>
</component>
<!-- <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">
<RunSynchronous>
<RunSynchronousCommand wcm:action="add">
<Order>1</Order>
<Path>c:\windows\system32\net.exe user administrator /active:yes</Path>
<Description>Enable Built-in Administrator</Description>
<CommandLine></CommandLine>
</RunSynchronousCommand>
</RunSynchronous>
</component> -->
</settings>
<settings pass="specialize">
</settings>

View File

@ -69,7 +69,11 @@
],
"provisioners": [
{
"type": "windows-update"
"type": "windows-update",
"filters": [
"exclude:$_.Title -like '*Preview*'",
"include:$true"
]
},
{
"type": "powershell",
@ -83,49 +87,48 @@
"inline": [
"choco config set --name=limit-output --value=LimitOutput",
"choco install -y 7zip.install",
"choco install -y putty"
"choco install -y sysinternals",
"choco install -y firefox"
]
},
{
"type": "windows-update",
"filters": [
"exclude:$_.Title -like '*Preview*'",
"include:$true"
]
},
{
"type": "powershell",
"scripts": [
"scripts/Windows10/01.Disabled services.ps1",
"scripts/Windows10/02.Disable IPv6.ps1",
"scripts/Windows10/03.Power settings timeout.ps1"
"inline": [
"New-Item -Path 'C:\\Payload\\Scripts' -ItemType 'Directory' -Force:$True -Confirm:$False"
]
},
{
"type": "windows-update"
"type": "file",
"source": "scripts/Windows10/payload/",
"destination": "C:\\Payload\\"
},
{
"type": "windows-restart",
"restart_check_command":"powershell -command \"& {Write-Output 'Probing restart status'}\""
"type": "powershell",
"scripts": [
"scripts/Windows10/Register-ScheduledTask.ps1"
]
}
],
"post-processors": [[
{
"type": "shell-local",
"inline": [
"pwsh -file scripts/Update-OvfConfiguration.ps1 \\",
" -OVFFile './output-win10/{{user `vm_guestos`}}-{{user `vm_name`}}.ovf'",
"pwsh -command \"& scripts/Update-OvfConfiguration.ps1 \\",
" -OVFFile '/scratch/win10/{{user `vm_guestos`}}-{{user `vm_name`}}.ovf' \\",
" -Parameter @{'appliance.name'='{{user `vm_guestos`}}';'appliance.version'='{{user `vm_name`}}'}\"",
"pwsh -file scripts/Update-Manifest.ps1 \\",
" -ManifestFileName './output-win10/{{user `vm_guestos`}}-{{user `vm_name`}}.mf'",
" -ManifestFileName '/scratch/win10/{{user `vm_guestos`}}-{{user `vm_name`}}.mf'",
"ovftool --acceptAllEulas --allowExtraConfig --overwrite \\",
" './output-win10/{{user `vm_guestos`}}-{{user `vm_name`}}.ovf' \\",
" '/scratch/win10/{{user `vm_guestos`}}-{{user `vm_name`}}.ovf' \\",
" /output/Windows10.ova"
]
}
],
[
{
"type": "shell-local",
"inline": [
"pwsh -file scripts/Remove-Resources.ps1 \\",
" -VMName '{{user `vm_guestos`}}-{{user `vm_name`}}' \\",
" -VSphereFQDN '{{user `vcenter_server`}}' \\",
" -VSphereUsername '{{user `vsphere_username`}}' \\",
" -VSpherePassword '{{user `vsphere_password`}}'"
]
}
]]
}

View File

@ -1,156 +0,0 @@
{
"builders": [
{
"type": "vsphere-iso",
"name": "win10-virtual",
"vcenter_server": "{{user `vcenter_server`}}",
"username": "{{user `vsphere_username`}}",
"password": "{{user `vsphere_password`}}",
"insecure_connection": "true",
"vm_name": "{{user `vm_guestos`}}-{{user `vm_name`}}-virtual",
"datastore": "{{user `vsphere_datastore`}}",
"folder": "{{user `vsphere_folder`}}",
"datacenter": "{{user `vsphere_datacenter`}}",
"host": "{{user `vsphere_host`}}",
"boot_order": "disk,cdrom",
"guest_os_type": "windows9_64Guest",
"communicator": "winrm",
"winrm_username": "administrator",
"winrm_password": "{{user `winrm_password`}}",
"winrm_timeout": "10m",
"cpus": 2,
"RAM": 8192,
"network_adapters": [
{
"network": "{{user `vsphere_network`}}",
"network_card": "vmxnet3"
}
],
"storage": [
{
"disk_size": 20480,
"disk_thin_provisioned": true
}
],
"disk_controller_type": "lsilogic-sas",
"usb_controller": "xhci",
"iso_url": "https://sn.itch.fyi/Repository/iso/Microsoft/Windows%2010/20H2/Win10_20H2_v2_English_x64.iso",
"iso_checksum": "sha256:6C6856405DBC7674EDA21BC5F7094F5A18AF5C9BACC67ED111E8F53F02E7D13D",
"iso_paths": [
"[Datastore01.NAS] contentlib-5c2187fa-55c5-4285-b06b-3f5f1ff9428d/e9342f62-6132-4044-bd42-48cab8c77034/VMware-tools-windows-11.2.1-17243207_4f88be10-b163-446b-ad7d-992e63b0e3ac.iso"
],
"floppy_files": [
"packer/preseed/Windows10/Autounattend.xml",
"packer/preseed/Windows10/Sysprep_Unattend.xml",
"scripts/Set-NetworkProfile.ps1",
"scripts/Disable-WinRM.ps1",
"scripts/Enable-WinRM.ps1",
"scripts/Install-VMwareTools.cmd"
],
"boot_command": "",
"boot_wait": "5m",
"shutdown_command": "C:\\Windows\\System32\\Sysprep\\sysprep.exe /generalize /oobe /unattend:A:\\Sysprep_Unattend.xml",
"shutdown_timeout": "1h"
},
{
"type": "vsphere-iso",
"name": "win10-physical",
"vcenter_server": "{{user `vcenter_server`}}",
"username": "{{user `vsphere_username`}}",
"password": "{{user `vsphere_password`}}",
"insecure_connection": "true",
"vm_name": "{{user `vm_guestos`}}-{{user `vm_name`}}-physical",
"datastore": "{{user `vsphere_datastore`}}",
"folder": "{{user `vsphere_folder`}}",
"datacenter": "{{user `vsphere_datacenter`}}",
"host": "{{user `vsphere_host`}}",
"boot_order": "disk,cdrom",
"guest_os_type": "windows9_64Guest",
"communicator": "winrm",
"winrm_username": "administrator",
"winrm_password": "{{user `winrm_password`}}",
"winrm_timeout": "10m",
"cpus": 2,
"RAM": 8192,
"network_adapters": [
{
"network": "{{user `vsphere_network`}}",
"network_card": "vmxnet3"
}
],
"storage": [
{
"disk_size": 20480,
"disk_thin_provisioned": true
}
],
"disk_controller_type": "lsilogic-sas",
"usb_controller": "xhci",
"iso_url": "https://sn.itch.fyi/Repository/iso/Microsoft/Windows%2010/20H2/Win10_20H2_v2_English_x64.iso",
"iso_checksum": "sha256:6C6856405DBC7674EDA21BC5F7094F5A18AF5C9BACC67ED111E8F53F02E7D13D",
"iso_paths": [
"[Datastore01.NAS] contentlib-5c2187fa-55c5-4285-b06b-3f5f1ff9428d/e9342f62-6132-4044-bd42-48cab8c77034/VMware-tools-windows-11.2.1-17243207_4f88be10-b163-446b-ad7d-992e63b0e3ac.iso"
],
"floppy_files": [
"packer/preseed/Windows10/Autounattend.xml",
"packer/preseed/Windows10/Sysprep_Unattend.xml",
"scripts/Set-NetworkProfile.ps1",
"scripts/Disable-WinRM.ps1",
"scripts/Enable-WinRM.ps1",
"scripts/Install-VMwareTools.cmd",
"scripts/Uninstall-VMwareTools.Sysprep.cmd"
],
"boot_command": "",
"boot_wait": "5m",
"shutdown_command": "A:\\Uninstall-VMwareTools.Sysprep.cmd",
"shutdown_timeout": "1h"
}
],
"provisioners": [
{
"type": "windows-update"
},
{
"type": "powershell",
"inline": [
"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12",
"Invoke-Expression ((New-Object Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))"
]
},
{
"type": "powershell",
"inline": [
"choco config set --name=limit-output --value=LimitOutput",
"choco install -y 7zip.install",
"choco install -y putty"
]
},
{
"type": "windows-update"
},
{
"type": "windows-restart",
"restart_check_command":"powershell -command \"& {Write-Output 'Probing restart status'}\""
}
]
}