[jamf][ubuntu] add ami support for ubuntu

deynekas · KatarzynaRu · commit d2c89f536189 · 2026-02-11T11:46:23.000+01:00
[jamf][ubuntu] Refactor packer templates based on upstream

[jamf][ubuntu] set volume type to gp3

[jamf][ubuntu] add ami support for ubuntu 24

[jamf][ubuntu] do not install miniconda due to license issues

[jamf][ubuntu] add amazon required plugin

[jamf][ubuntu] refactor script

[jamf][ubuntu] packer fmt

[jamf]ubuntu] add amazon-ebs.ubuntu-base-2204 source

[jamf][ubuntu] waagent specific provisioner to be run only on azure-arm.build_image

[jamf][ubuntu] move azure-arm specific configuration into configure-environment-azure-arm.sh

Updating readme file for ubuntu24 version 20250330.1.1
diff --git a/images/ubuntu/scripts/build/configure-environment-azure-arm.sh b/images/ubuntu/scripts/build/configure-environment-azure-arm.sh
@@ -0,0 +1,10 @@
+#!/bin/bash -e
+################################################################################
+##  File:  configure-environment.sh
+##  Desc:  Configure system and environment for azure build target
+################################################################################
+
+# Change waagent entries to use /mnt for swapfile
+sed -i -e 's/ResourceDisk.Format=n/ResourceDisk.Format=y/g' \
+  -e 's/ResourceDisk.EnableSwap=n/ResourceDisk.EnableSwap=y/g' \
+  -e 's/ResourceDisk.SwapSizeMB=0/ResourceDisk.SwapSizeMB=4096/g' /etc/waagent.conf
diff --git a/images/ubuntu/scripts/build/configure-environment.sh b/images/ubuntu/scripts/build/configure-environment.sh
@@ -19,11 +19,6 @@ set_etc_environment_variable "ACCEPT_EULA" "Y"
 mkdir -p /etc/skel/.config/configstore
 set_etc_environment_variable "XDG_CONFIG_HOME" '$HOME/.config'
 
-# Change waagent entries to use /mnt for swap file
-sed -i 's/ResourceDisk.Format=n/ResourceDisk.Format=y/g' /etc/waagent.conf
-sed -i 's/ResourceDisk.EnableSwap=n/ResourceDisk.EnableSwap=y/g' /etc/waagent.conf
-sed -i 's/ResourceDisk.SwapSizeMB=0/ResourceDisk.SwapSizeMB=4096/g' /etc/waagent.conf
-
 # Add localhost alias to ::1 IPv6
 sed -i 's/::1 ip6-localhost ip6-loopback/::1     localhost ip6-localhost ip6-loopback/g' /etc/hosts
 
diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
@@ -61,7 +61,6 @@ $packageManagement = $installedSoftware.AddHeader("Package Management")
 $packageManagement.AddToolVersion("cpan", $(Get-CpanVersion))
 $packageManagement.AddToolVersion("Helm", $(Get-HelmVersion))
 $packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion))
-$packageManagement.AddToolVersion("Miniconda", $(Get-MinicondaVersion))
 $packageManagement.AddToolVersion("Npm", $(Get-NpmVersion))
 if (-not $(Test-IsUbuntu24)) {
     $packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion))
diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1
@@ -37,7 +37,7 @@ Describe "Rust" {
     It "Rustfmt is installed" {
         "rustfmt --version" | Should -ReturnZeroExitCode
     }
-    
+
     It "cargo" {
         "cargo --version" | Should -ReturnZeroExitCode
     }
@@ -291,12 +291,6 @@ Describe "Leiningen" -Skip:((-not (Test-IsUbuntu22))) {
     }
 }
 
-Describe "Conda" {
-    It "conda" {
-        "conda --version" | Should -ReturnZeroExitCode
-    }
-}
-
 Describe "Packer" {
     It "packer" {
         "packer --version" | Should -ReturnZeroExitCode
diff --git a/images/ubuntu/templates/build.ubuntu-22_04.pkr.hcl b/images/ubuntu/templates/build.ubuntu-22_04.pkr.hcl
@@ -1,6 +1,6 @@
 build {
-  sources = ["source.azure-arm.image"]
   name = "ubuntu-22_04"
+  sources = var.sources
 
   provisioner "shell" {
     execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
@@ -76,6 +76,13 @@ build {
     scripts          = ["${path.root}/../scripts/build/configure-environment.sh"]
   }
 
+  provisioner "shell" {
+    only             = ["azure-arm.image"]
+    environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "HELPER_SCRIPTS=${var.helper_script_folder}"]
+    execute_command  = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
+    scripts          = ["${path.root}/../scripts/build/configure-environment-azure-arm.sh"]
+  }
+
   provisioner "shell" {
     environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"]
     execute_command  = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
@@ -128,7 +135,6 @@ build {
       "${path.root}/../scripts/build/install-kubernetes-tools.sh",
       "${path.root}/../scripts/build/install-oc-cli.sh",
       "${path.root}/../scripts/build/install-leiningen.sh",
-      "${path.root}/../scripts/build/install-miniconda.sh",
       "${path.root}/../scripts/build/install-mono.sh",
       "${path.root}/../scripts/build/install-kotlin.sh",
       "${path.root}/../scripts/build/install-mysql.sh",
@@ -249,6 +255,7 @@ build {
   }
 
   provisioner "shell" {
+    only            = ["azure-arm.image"]
     execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
     inline          = ["sleep 30", "/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"]
   }
diff --git a/images/ubuntu/templates/build.ubuntu-24_04.pkr.hcl b/images/ubuntu/templates/build.ubuntu-24_04.pkr.hcl
@@ -1,6 +1,6 @@
 build {
-  sources = ["source.azure-arm.image"]
   name = "ubuntu-24_04"
+  sources = var.sources
 
   provisioner "shell" {
     execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
@@ -76,6 +76,14 @@ build {
     scripts          = ["${path.root}/../scripts/build/configure-environment.sh"]
   }
 
+  provisioner "shell" {
+    only             = ["azure-arm.image"]
+    environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "HELPER_SCRIPTS=${var.helper_script_folder}"]
+    execute_command  = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
+    scripts          = ["${path.root}/../scripts/build/configure-environment-azure-arm.sh"]
+  }
+
+
   provisioner "shell" {
     environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"]
     execute_command  = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
@@ -124,7 +132,6 @@ provisioner "shell" {
       "${path.root}/../scripts/build/install-haskell.sh",
       "${path.root}/../scripts/build/install-java-tools.sh",
       "${path.root}/../scripts/build/install-kubernetes-tools.sh",
-      "${path.root}/../scripts/build/install-miniconda.sh",
       "${path.root}/../scripts/build/install-kotlin.sh",
       "${path.root}/../scripts/build/install-mysql.sh",
       "${path.root}/../scripts/build/install-nginx.sh",
@@ -228,6 +235,7 @@ provisioner "shell" {
   }
 
   provisioner "shell" {
+    only            = ["azure-arm.image"]
     execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
     inline          = ["sleep 30", "/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"]
   }
diff --git a/images/ubuntu/templates/plugins.pkr.hcl b/images/ubuntu/templates/plugins.pkr.hcl
@@ -0,0 +1,12 @@
+packer {
+  required_plugins {
+    azure = {
+      source  = "github.com/hashicorp/azure"
+      version = "2.2.1"
+    }
+    amazon = {
+      source = "github.com/hashicorp/amazon"
+      version = "1.3.2"
+    }
+  }
+}
diff --git a/images/ubuntu/templates/source.ubuntu.pkr.hcl b/images/ubuntu/templates/source.ubuntu.pkr.hcl
@@ -47,3 +47,50 @@ source "azure-arm" "image" {
     }
   }
 }
+
+source "amazon-ebs" "ubuntu" {
+  ami_name    = "${var.aws_ami_name}"
+  ami_regions = var.aws_ami_regions # all known AWS regions
+
+  deprecate_at = timeadd(timestamp(), "${var.aws_deprecate_after}")
+
+  run_tags = var.aws_run_tags
+  tags     = var.aws_tags
+
+  instance_type = "${var.aws_instance_type}"
+
+  force_deregister      = var.aws_force_deregister
+  force_delete_snapshot = var.aws_force_delete_snapshot
+
+  region    = "${var.aws_region}"
+  vpc_id    = "${var.aws_vpc_id}"
+  subnet_id = "${var.aws_subnet_id}"
+
+  launch_block_device_mappings {
+    device_name           = "/dev/sda1"
+    volume_size           = var.aws_volume_size
+    delete_on_termination = true
+  }
+
+  run_volume_tags = var.aws_run_volume_tags
+
+  associate_public_ip_address = var.aws_associate_public_ip_address
+  ssh_username                = "ubuntu"
+
+  metadata_options {
+    instance_metadata_tags = "enabled"
+  }
+
+  source_ami_filter {
+    # See https://ubuntu.com/server/docs/cloud-images/amazon-ec2
+    filters = {
+      virtualization-type = "hvm"
+      name                = var.aws_ami_filter_name
+      root-device-type    = "ebs"
+      architecture        = "x86_64"
+    }
+
+    owners      = ["099720109477"] # this is Canonical (official)
+    most_recent = true
+  }
+}
diff --git a/images/ubuntu/templates/variable.ubuntu.pkr.hcl b/images/ubuntu/templates/variable.ubuntu.pkr.hcl
@@ -1,3 +1,73 @@
+// AWS support related variables
+variable "sources" {
+  type    = list(string)
+  default = ["source.azure-arm.build_image"]
+}
+variable "aws_ami_name" {
+  type    = string
+  default = "github-runner"
+}
+variable "aws_ami_filter_name" {
+  type    = string
+  default = "ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*"
+}
+variable "aws_ami_regions" {
+  type    = list(string)
+  default = ["eu-west-1"]
+}
+variable "aws_instance_type" {
+  type    = string
+  default = "m5.large"
+}
+variable "aws_run_tags" {
+  type    = map(string)
+  default = {}
+}
+variable "aws_tags" {
+  type    = map(string)
+  default = {}
+}
+variable "aws_force_deregister" {
+  type    = bool
+  default = false
+}
+variable "aws_force_delete_snapshot" {
+  type    = bool
+  default = false
+}
+variable "aws_region" {
+  type    = string
+  default = "${env("AWS_REGION")}"
+}
+variable "aws_vpc_id" {
+  type    = string
+  default = "${env("AWS_VPC_ID")}"
+}
+variable "aws_subnet_id" {
+  type    = string
+  default = "${env("AWS_SUBNET_ID")}"
+}
+variable "aws_volume_size" {
+  type    = number
+  default = 150
+}
+variable "aws_run_volume_tags" {
+  type    = map(string)
+  default = {}
+}
+variable "aws_associate_public_ip_address" {
+  type    = bool
+  default = false
+}
+variable "aws_ssh_username" {
+  type    = string
+  default = "ubuntu"
+}
+variable "aws_deprecate_after" {
+  type    = string
+  default = "4380h" # 4380 hours = 6 months
+}
+
 // Authentication related variables
 variable "client_cert_path" {
   type    = string
@@ -127,8 +197,8 @@ variable "vm_size" {
   default = "Standard_D4s_v4"
 }
 variable "winrm_username" {         // The username used to connect to the VM via WinRM
-    type    = string                // Also applies to the username used to create the VM
-    default = "packer"
+  type    = string                // Also applies to the username used to create the VM
+  default = "packer"
 }
 
 // Image related variables

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ Describe "Rust" {`
`37`	`37`	`It "Rustfmt is installed" {`
`38`	`38`	`"rustfmt --version" \| Should -ReturnZeroExitCode`
`39`	`39`	`}`
`40`		`-`
	`40`	`+`
`41`	`41`	`It "cargo" {`
`42`	`42`	`"cargo --version" \| Should -ReturnZeroExitCode`
`43`	`43`	`}`
`@@ -291,12 +291,6 @@ Describe "Leiningen" -Skip:((-not (Test-IsUbuntu22))) {`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`
`294`		`-Describe "Conda" {`
`295`		`- It "conda" {`
`296`		`- "conda --version" \| Should -ReturnZeroExitCode`
`297`		`- }`
`298`		`-}`
`299`		`-`
`300`	`294`	`Describe "Packer" {`
`301`	`295`	`It "packer" {`
`302`	`296`	`"packer --version" \| Should -ReturnZeroExitCode`