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.

Sign up for GitHub

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

[Windows] Add WSL2 to Windows-2025 image #11242

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −4
Open

[Windows] Add WSL2 to Windows-2025 image #11242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions images/windows/scripts/build/Configure-System.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ $servicesToDisable = @(
'wuauserv'
'DiagTrack'
'dmwappushservice'
'PcaSvc'
$(if(-not (Test-IsWin25)){'PcaSvc'})
'SysMain'
'gupdate'
'gupdatem'
'StorSvc'
$(if(-not (Test-IsWin25)){'StorSvc'})
) | Get-Service -ErrorAction SilentlyContinue
Stop-Service $servicesToDisable
$servicesToDisable.WaitForStatus('Stopped', "00:01:00")
Expand Down
16 changes: 16 additions & 0 deletions images/windows/scripts/build/Install-WSL2.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Write-Host "Install WSL2"

$version = (Get-GithubReleasesByVersion -Repo "microsoft/WSL" -Version "latest").version
$downloadUrl = Resolve-GithubReleaseAssetUrl `
-Repo "microsoft/WSL" `
-Version $version `
-UrlMatchPattern "wsl.*.x64.msi"

Install-Binary -Type MSI `
-Url $downloadUrl `
-ExpectedSHA256Sum "CD3F2A68A1A5836F6A1CC9965A7F5F54DB267CA221EAA87DF29345AB7957AEC4"

Write-Host "Performing wsl --install --no-distribution"
wsl.exe --install --no-distribution

Invoke-PesterTests -TestFile "WindowsFeatures" -TestName "WSL2"
7 changes: 6 additions & 1 deletion images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ Import-Module (Join-Path $PSScriptRoot "SoftwareReport.VisualStudio.psm1") -Disa
# Software report
$softwareReport = [SoftwareReport]::new($(Build-OSInfoSection))
$optionalFeatures = $softwareReport.Root.AddHeader("Windows features")
$optionalFeatures.AddToolVersion("Windows Subsystem for Linux (WSLv1):", "Enabled")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit. something like below might be better

$optionalFeatures.AddToolVersion("Windows Subsystem for Linux (WSLv1):", "Enabled")
 if (Test-IsWin25) {
    $optionalFeatures.AddToolVersion("Windows Subsystem for Linux (Default, WSLv2):", $(Get-WSL2Version))
}

if (-not (Test-IsWin25)) {
$optionalFeatures.AddToolVersion("Windows Subsystem for Linux (WSLv1):", "Enabled")
} else {
$optionalFeatures.AddToolVersion("Windows Subsystem for Linux (WSLv1):", "Enabled")
$optionalFeatures.AddToolVersion("Windows Subsystem for Linux (WSLv2):", $(Get-WSL2Version))
}
$installedSoftware = $softwareReport.Root.AddHeader("Installed Software")

# Language and Runtime
Expand Down
4 changes: 4 additions & 0 deletions images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,3 +318,7 @@ function Get-ImageMagickVersion {
function Get-MongoshVersion {
return $(mongosh --version)
}

function Get-WSL2Version {
return $((Get-AppxPackage -Name "MicrosoftCorporationII.WindowsSubsystemForLinux").version)
}
6 changes: 6 additions & 0 deletions images/windows/scripts/tests/WindowsFeatures.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,9 @@ Describe "Windows Updates" {
$State | Should -BeIn $expect
}
}

Describe "WSL2" {
It "WSL status should return zero exit code" {
"wsl --status" | Should -ReturnZeroExitCode
}
}
3 changes: 2 additions & 1 deletion images/windows/templates/windows-2025.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ build {
inline = ["if (-not ((net localgroup Administrators) -contains '${var.install_user}')) { exit 1 }"]
}

provisioner "powershell" {
provisioner "powershell" {
elevated_password = "${var.install_password}"
elevated_user = "${var.install_user}"
inline = ["bcdedit.exe /set TESTSIGNING ON"]
Expand All @@ -256,6 +256,7 @@ build {
"${path.root}/../scripts/build/Configure-WindowsDefender.ps1",
"${path.root}/../scripts/build/Configure-PowerShell.ps1",
"${path.root}/../scripts/build/Install-PowerShellModules.ps1",
"${path.root}/../scripts/build/Install-WSL2.ps1",
"${path.root}/../scripts/build/Install-WindowsFeatures.ps1",
"${path.root}/../scripts/build/Install-Chocolatey.ps1",
"${path.root}/../scripts/build/Configure-BaseImage.ps1",
Expand Down
Loading