From 89f5712cad8774c82104eb794581c5d3c94ebcf2 Mon Sep 17 00:00:00 2001
From: ijunaidm <160701894+ijunaidm@users.noreply.github.com>
Date: Wed, 4 Sep 2024 01:10:52 +0530
Subject: [PATCH] Add Packer tool to Ubuntu24.04 image (#10545)

Co-authored-by: Mohammed Junaid <mohammedjunaid@Mohammeds-MacBook-Pro.local>
---
 images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 | 4 +---
 images/ubuntu/scripts/tests/Tools.Tests.ps1                | 2 +-
 images/ubuntu/templates/ubuntu-24.04.pkr.hcl               | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
index d7c82e55c..df241051a 100644
--- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
+++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
@@ -140,9 +140,7 @@ if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
     $tools.AddToolVersion("nvm", $(Get-NvmVersion))
 }
 $tools.AddToolVersion("OpenSSL", $(Get-OpensslVersion))
-if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
-    $tools.AddToolVersion("Packer", $(Get-PackerVersion))
-}
+$tools.AddToolVersion("Packer", $(Get-PackerVersion))
 $tools.AddToolVersion("Parcel", $(Get-ParcelVersion))
 if (Test-IsUbuntu20) {
     $tools.AddToolVersion("PhantomJS", $(Get-PhantomJSVersion))
diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1
index 2c891f181..749e65010 100644
--- a/images/ubuntu/scripts/tests/Tools.Tests.ps1
+++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1
@@ -319,7 +319,7 @@ Describe "Conda" {
     }
 }
 
-Describe "Packer" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) {
+Describe "Packer" {
     It "packer" {
         "packer --version" | Should -ReturnZeroExitCode
     }
diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl
index 3324ffd76..76971e3cf 100644
--- a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl
+++ b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl
@@ -310,6 +310,7 @@ provisioner "shell" {
       "${path.root}/../scripts/build/install-rust.sh",
       "${path.root}/../scripts/build/install-julia.sh",
       "${path.root}/../scripts/build/install-selenium.sh",
+      "${path.root}/../scripts/build/install-packer.sh",
       "${path.root}/../scripts/build/install-vcpkg.sh",
       "${path.root}/../scripts/build/configure-dpkg.sh",
       "${path.root}/../scripts/build/install-yq.sh",