Skip to content
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Skip PowerShell tests on 3.18
  • Loading branch information
lbussell committed Jun 1, 2023
commit f082ecc80840e331d31e1bbd166a452f4d3c701a
17 changes: 13 additions & 4 deletions tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,20 @@ public SdkImageTests(ITestOutputHelper outputHelper)

private bool IsPowerShellSupported(ProductImageData imageData, out string reason)
{
if (imageData.OS.Contains("alpine") && imageData.IsArm)
if (imageData.OS.Contains("alpine"))
{
// PowerShell needs support for Arm-based Alpine (https://github.com/PowerShell/PowerShell/issues/14667, https://github.com/PowerShell/PowerShell/issues/12937)
reason = "PowerShell does not have Alpine arm images, skip testing";
return false;
if (imageData.IsArm)
{
// PowerShell needs support for Arm-based Alpine (https://github.com/PowerShell/PowerShell/issues/14667, https://github.com/PowerShell/PowerShell/issues/12937)
reason = "PowerShell does not have Alpine arm images, skip testing";
return false;
}
else if (imageData.OS.Contains("3.18"))
Copy link
Member

Choose a reason for hiding this comment

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

We should constrain this further since it's working on everything except for 6.0.

Suggested change
else if (imageData.OS.Contains("3.18"))
else if (imageData.Version.Major == 6 && imageData.OS.Contains("3.18"))

{
// PowerShell does not support Alpine 3.18 yet (https://github.com/PowerShell/PowerShell/issues/19703)
reason = "Powershell does not support Alpine 3.18 yet, skip testing"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
reason = "Powershell does not support Alpine 3.18 yet, skip testing"
reason = "Powershell does not support Alpine 3.18 yet, skip testing";

return false;
}
}

reason = null;
Expand Down