Skip to content
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.

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

feat: bump windows image version for 2024-06B #4505

Merged
merged 4 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions vhdbuilder/packer/configure-windows-vhd.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,9 @@ function Update-Registry {
Write-Log "Enable 2 fixes in 2024-04B"
Enable-WindowsFixInFeatureManagement -Name 2290715789
Enable-WindowsFixInFeatureManagement -Name 3152880268

Write-Log "Enable 1 fix in 2024-06B"
Enable-WindowsFixInFeatureManagement -Name 1605443213
}

if ($env:WindowsSKU -Like '2022*') {
Expand Down Expand Up @@ -666,6 +669,11 @@ function Update-Registry {
Enable-WindowsFixInFeatureManagement -Name 4186914956
Enable-WindowsFixInFeatureManagement -Name 3173070476
Enable-WindowsFixInFeatureManagement -Name 3958450316

Write-Log "Enable 3 fixes in 2024-06B"
Enable-WindowsFixInFeatureManagement -Name 2540111500
Enable-WindowsFixInFeatureManagement -Name 50261647
Enable-WindowsFixInFeatureManagement -Name 1475968140
}

if ($env:WindowsSKU -Like '23H2*') {
Expand Down
8 changes: 4 additions & 4 deletions vhdbuilder/packer/generate-windows-vhd-configuration.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ $global:defenderUpdateInfoUrl = "https://go.microsoft.com/fwlink/?linkid=870379&

switch -Regex ($windowsSku) {
"2019-containerd" {
$global:patchUrls = @("https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2024/05/windows10.0-kb5037765-x64_3ca0b737e301d4e398a38f1d67966f1c82507fa8.msu")
$global:patchIDs = @("KB5037765")
$global:patchUrls = @("https://catalog.s.download.windowsupdate.com/c/msdownload/update/software/secu/2024/06/windows10.0-kb5039217-x64_bc72f4ed75c6dd7bf033b823f79533d5772769a3.msu")
$global:patchIDs = @("KB5039217")

$global:imagesToPull = @(
"mcr.microsoft.com/windows/servercore:ltsc2019",
"mcr.microsoft.com/windows/nanoserver:1809"
)
}
"2022-containerd*" {
$global:patchUrls = @("https://catalog.s.download.windowsupdate.com/c/msdownload/update/software/secu/2024/05/windows10.0-kb5037782-x64_a28aa2576fc6b120b127acfbb901d3546ba9db82.msu")
$global:patchIDs = @("KB5037782")
$global:patchUrls = @("https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2024/06/windows10.0-kb5039227-x64_136403ab41a524bb82063bc097e9cafbf0039630.msu")
$global:patchIDs = @("KB5039227")

$global:imagesToPull = @(
"mcr.microsoft.com/windows/servercore:ltsc2022",
Expand Down
6 changes: 6 additions & 0 deletions vhdbuilder/packer/test/windows-vhd-content-test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,8 @@ function Test-RegistryAdded {

Validate-WindowsFixInFeatureManagement -Name 2290715789
Validate-WindowsFixInFeatureManagement -Name 3152880268

Validate-WindowsFixInFeatureManagement -Name 1605443213
}
if ($env:WindowsSKU -Like '2022*') {
Validate-WindowsFixInFeatureManagement -Name 2629306509
Expand Down Expand Up @@ -398,6 +400,10 @@ function Test-RegistryAdded {
Validate-WindowsFixInFeatureManagement -Name 4186914956
Validate-WindowsFixInFeatureManagement -Name 3173070476
Validate-WindowsFixInFeatureManagement -Name 3958450316

Validate-WindowsFixInFeatureManagement -Name 2540111500
Validate-WindowsFixInFeatureManagement -Name 50261647
Validate-WindowsFixInFeatureManagement -Name 1475968140
}
if ($env:WindowsSKU -Like '23H2*') {
Validate-WindowsFixInHnsState -Name NamespaceExcludedUdpPorts -Value 65330
Expand Down
10 changes: 5 additions & 5 deletions vhdbuilder/packer/windows-image.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,31 @@
# CLI example to get the latest image version:
# az vm image show --urn MicrosoftWindowsServer:WindowsServer:2019-Datacenter-Core-smalldisk:latest
WINDOWS_2019_BASE_IMAGE_SKU=2019-Datacenter-Core-smalldisk
WINDOWS_2019_BASE_IMAGE_VERSION=17763.5820.240510
WINDOWS_2019_BASE_IMAGE_VERSION=17763.5936.240607

# CLI example to get the latest image version:
# az vm image show --urn MicrosoftWindowsServer:WindowsServer:2022-Datacenter-Core-smalldisk:latest
WINDOWS_2022_BASE_IMAGE_SKU=2022-Datacenter-Core-smalldisk
WINDOWS_2022_BASE_IMAGE_VERSION=20348.2461.240510
WINDOWS_2022_BASE_IMAGE_VERSION=20348.2527.240607

# CLI example to get all available image version under a SKU (suffix g2 for Gen 2):
# az vm image list --all --publisher MicrosoftWindowsServer --offer WindowsServer --output table -s 2022-datacenter-core-smalldisk-g2
# CLI example to get the latest image version:
# az vm image show --urn MicrosoftWindowsServer:WindowsServer:2022-datacenter-core-smalldisk-g2:latest
WINDOWS_2022_GEN2_BASE_IMAGE_SKU=2022-datacenter-core-smalldisk-g2
WINDOWS_2022_GEN2_BASE_IMAGE_VERSION=20348.2461.240510
WINDOWS_2022_GEN2_BASE_IMAGE_VERSION=20348.2527.240607

# CLI example to get the latest image version:
# az vm image show --urn MicrosoftWindowsServer:WindowsServer:23h2-datacenter-core:latest
WINDOWS_23H2_BASE_IMAGE_SKU=23h2-datacenter-core
WINDOWS_23H2_BASE_IMAGE_VERSION=25398.887.240505
WINDOWS_23H2_BASE_IMAGE_VERSION=25398.950.240607

# CLI example to get all available image version under a SKU (suffix g2 for Gen 2):
# az vm image list --all --publisher MicrosoftWindowsServer --offer WindowsServer --output table -s 23h2-datacenter-core-g2
# CLI example to get the latest image version:
# az vm image show --urn MicrosoftWindowsServer:WindowsServer:23h2-datacenter-core-g2:latest
WINDOWS_23H2_GEN2_BASE_IMAGE_SKU=23h2-datacenter-core-g2
WINDOWS_23H2_GEN2_BASE_IMAGE_VERSION=25398.887.240505
WINDOWS_23H2_GEN2_BASE_IMAGE_VERSION=25398.950.240607

# Please uncomment the following lines and set a larger os disk size that is at least 30GB when your PR check-in fails
# WINDOWS_2019_CONTAINERD_OS_DISK_SIZE_GB=30
Expand Down
6 changes: 5 additions & 1 deletion vhdbuilder/packer/write-release-notes-windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,11 @@ $wuRegistryNames = @(
"1552261773",
"4186914956",
"3173070476",
"3958450316"
"3958450316",
"1605443213",
"2540111500",
"50261647",
"1475968140"
)

foreach ($key in $wuRegistryKeys) {
Expand Down
Loading