diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 index d65eb5536..9fa03583f 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 @@ -16,4 +16,9 @@ function Get-FirefoxVersion { function Get-GeckodriverVersion { $geckodriverVersion = geckodriver --version | Select-Object -First 1 | Take-OutputPart -Part 1 return "Geckodriver $geckodriverVersion" +} + +function Get-ChromiumVersion { + $chromiumVersion = chromium --version | Take-OutputPart -Part 0,1 + return $chromiumVersion } \ No newline at end of file diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 5259a88f7..b686122d2 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -200,12 +200,18 @@ $markdown += New-MDList -Style Unordered -Lines (@( ) $markdown += New-MDHeader "Browsers and Drivers" -Level 3 -$markdown += New-MDList -Style Unordered -Lines @( + +$browsersAndDriversList = @( (Get-ChromeVersion), (Get-ChromeDriverVersion), (Get-FirefoxVersion), (Get-GeckodriverVersion) ) +if (Test-IsUbuntu20) { + $browsersAndDriversList = @(Get-ChromiumVersion) + $browsersAndDriversList +} + +$markdown += New-MDList -Style Unordered -Lines $browsersAndDriversList $markdown += New-MDHeader ".NET Core SDK" -Level 3 $markdown += New-MDList -Style Unordered -Lines @( diff --git a/images/linux/scripts/tests/Browsers.Tests.ps1 b/images/linux/scripts/tests/Browsers.Tests.ps1 index b96e1c2ae..1efd16343 100644 --- a/images/linux/scripts/tests/Browsers.Tests.ps1 +++ b/images/linux/scripts/tests/Browsers.Tests.ps1 @@ -16,4 +16,10 @@ Describe "Chrome" { It "Chrome Driver" { "chromedriver --version" | Should -ReturnZeroExitCode } +} + +Describe "Chromium" -Skip:(-not (Test-IsUbuntu20)) { + It "Chromium" { + "chromium --version" | Should -ReturnZeroExitCode + } } \ No newline at end of file diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index ba5fcf47a..fe27c40b9 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -106,6 +106,7 @@ "apt": { "common_packages": [ "build-essential", + "chromium-browser", "dbus", "dnsutils", "dpkg",