diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index 65aac58a6..b06946acf 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -219,10 +219,9 @@ $browsersTools = $installedSoftware.AddHeader("Browsers and Drivers") $browsersTools.AddToolVersion("Google Chrome", $(Get-ChromeVersion)) $browsersTools.AddToolVersion("ChromeDriver", $(Get-ChromeDriverVersion)) $browsersTools.AddToolVersion("Chromium", $(Get-ChromiumVersion)) -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $browsersTools.AddToolVersion("Microsoft Edge", $(Get-EdgeVersion)) - $browsersTools.AddToolVersion("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) -} +$browsersTools.AddToolVersion("Microsoft Edge", $(Get-EdgeVersion)) +$browsersTools.AddToolVersion("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) + $browsersTools.AddToolVersion("Selenium server", $(Get-SeleniumVersion)) $browsersTools.AddToolVersion("Mozilla Firefox", $(Get-FirefoxVersion)) $browsersTools.AddToolVersion("Geckodriver", $(Get-GeckodriverVersion)) diff --git a/images/ubuntu/scripts/tests/Browsers.Tests.ps1 b/images/ubuntu/scripts/tests/Browsers.Tests.ps1 index 5d50f996b..1ea5230f3 100644 --- a/images/ubuntu/scripts/tests/Browsers.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Browsers.Tests.ps1 @@ -24,7 +24,7 @@ Describe "Chrome" { } } -Describe "Edge" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { +Describe "Edge" { It "Edge" { "microsoft-edge --version" | Should -ReturnZeroExitCode } diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl index 39c2b23d6..634721ebf 100644 --- a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl @@ -289,6 +289,7 @@ provisioner "shell" { "${path.root}/../scripts/build/install-codeql-bundle.sh", "${path.root}/../scripts/build/install-container-tools.sh", "${path.root}/../scripts/build/install-dotnetcore-sdk.sh", + "${path.root}/../scripts/build/install-microsoft-edge.sh", "${path.root}/../scripts/build/install-gcc-compilers.sh", "${path.root}/../scripts/build/install-firefox.sh", "${path.root}/../scripts/build/install-gfortran.sh",