From b60b7ab30f16e8d7048a8f3d437ddefec573aae9 Mon Sep 17 00:00:00 2001 From: ijunaidm <160701894+ijunaidm@users.noreply.github.com> Date: Thu, 12 Sep 2024 01:43:36 +0530 Subject: [PATCH] Add firefox to Ubuntu24.04 image (#10589) Co-authored-by: Mohammed Junaid --- images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 | 7 +++---- images/ubuntu/scripts/tests/Browsers.Tests.ps1 | 2 +- images/ubuntu/templates/ubuntu-24.04.pkr.hcl | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index f4ca60b70..65aac58a6 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -224,10 +224,9 @@ if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $browsersTools.AddToolVersion("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) } $browsersTools.AddToolVersion("Selenium server", $(Get-SeleniumVersion)) -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $browsersTools.AddToolVersion("Mozilla Firefox", $(Get-FirefoxVersion)) - $browsersTools.AddToolVersion("Geckodriver", $(Get-GeckodriverVersion)) -} +$browsersTools.AddToolVersion("Mozilla Firefox", $(Get-FirefoxVersion)) +$browsersTools.AddToolVersion("Geckodriver", $(Get-GeckodriverVersion)) + # Environment variables $browsersTools.AddHeader("Environment variables").AddTable($(Build-BrowserWebdriversEnvironmentTable)) diff --git a/images/ubuntu/scripts/tests/Browsers.Tests.ps1 b/images/ubuntu/scripts/tests/Browsers.Tests.ps1 index 7848c676c..5d50f996b 100644 --- a/images/ubuntu/scripts/tests/Browsers.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Browsers.Tests.ps1 @@ -1,4 +1,4 @@ -Describe "Firefox" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { +Describe "Firefox" { It "Firefox" { "firefox --version" | Should -ReturnZeroExitCode } diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl index 5fe65f4fb..39c2b23d6 100644 --- a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl @@ -290,6 +290,7 @@ provisioner "shell" { "${path.root}/../scripts/build/install-container-tools.sh", "${path.root}/../scripts/build/install-dotnetcore-sdk.sh", "${path.root}/../scripts/build/install-gcc-compilers.sh", + "${path.root}/../scripts/build/install-firefox.sh", "${path.root}/../scripts/build/install-gfortran.sh", "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-git-lfs.sh",