test(packer): make image builder simplier.

tests/Makefile

@@ -12,14 +12,13 @@
 flavor ?= 
 disk ?= 10G
 
-VERSION := 0.$(shell git rev-list --count HEAD)
+BASE = archlinux debian ubuntu22 ubuntu24 opensuse fedora
-BASE = archlinux debian ubuntu opensuse fedora
 
 .PHONY: ${BASE} lint
 
 $(BASE):
 	@make --directory=../ package dist=${@}
-	@packer build -force -var version=${VERSION} \
+	@packer build -force \
 		-var disk_size=${disk} -var flavor="${flavor}" \
 		-only=qemu.${@} packer/
 

tests/cloud-init/debian-gnome.user-data.yml

@@ -24,10 +24,10 @@ packages:
   - devscripts
   - htop
   - qemu-guest-agent
-  - spice-vdagent
   - rsync
-  - vim
+  - spice-vdagent
   - task-gnome-desktop
+  - vim
 
 runcmd:
   - apt-get update -y

tests/cloud-init/debian-kde.user-data.yml

@@ -24,8 +24,8 @@ packages:
   - devscripts
   - htop
   - qemu-guest-agent
-  - spice-vdagent
   - rsync
+  - spice-vdagent
   - vim
   - task-kde-desktop
 

tests/cloud-init/opensuse-gnome.user-data.yml

@@ -20,19 +20,15 @@ packages:
   - bash-completion
   - distribution-release
   - git
+  - go
   - golang-packaging
   - htop
   - make
   - rpmbuild
+  - rsync
   - vim
 
 write_files:
-  # Set some bash aliases
-  - path: /home/${username}/.bashrc
-    append: true
-    content: |
-      [[ -f ~/.bash_aliases ]] && source ~/.bash_aliases
-
   # Setup shared directory
   - path: /etc/fstab
     append: true

tests/cloud-init/opensuse-kde.user-data.yml

@@ -20,19 +20,15 @@ packages:
   - bash-completion
   - distribution-release
   - git
+  - go
   - golang-packaging
   - htop
   - make
   - rpmbuild
+  - rsync
   - vim
 
 write_files:
-  # Set some bash aliases
-  - path: /home/${username}/.bashrc
-    append: true
-    content: |
-      [[ -f ~/.bash_aliases ]] && source ~/.bash_aliases
-
   # Setup shared directory
   - path: /etc/fstab
     append: true

tests/cloud-init/ubuntu22-desktop.user-data.yml

@@ -18,18 +18,19 @@ package_update: true
 package_upgrade: true
 package_reboot_if_required: false
 packages:
-  - ubuntu-desktop
-  - linux-generic-hwe-22.04
-  - qemu-guest-agent
-  - spice-vdagent
-  - terminator
   - apparmor-profiles
   - build-essential
   - config-package-dev
   - debhelper
   - devscripts
   - golang-go
+  - linux-generic-hwe-22.04
+  - qemu-guest-agent
   - rsync
+  - spice-vdagent
+  - terminator
+  - ubuntu-desktop
+  - vim
 
 snap:
   commands:

tests/cloud-init/ubuntu24-desktop.user-data.yml

@@ -20,18 +20,19 @@ package_update: true
 package_upgrade: true
 package_reboot_if_required: false
 packages:
-  - ubuntu-desktop
-  - linux-generic-hwe-24.04
-  - qemu-guest-agent
-  - spice-vdagent
-  - terminator
   - apparmor-profiles
   - build-essential
   - config-package-dev
   - debhelper
   - devscripts
   - golang-go
+  - linux-generic-hwe-24.04
+  - qemu-guest-agent
   - rsync
+  - spice-vdagent
+  - terminator
+  - ubuntu-desktop
+  - vim
 
 snap:
   commands:

tests/packer/archlinux.pkr.hcl

@@ -27,7 +27,7 @@ source "qemu" "archlinux" {
   cd_label           = "cidata"
   cd_content = {
     "meta-data" = ""
-    "user-data" = templatefile("${path.cwd}/packer/init/${source.name}-${var.flavor}.user-data.yml",
+    "user-data" = templatefile("${path.cwd}/cloud-init/${source.name}-${var.flavor}.user-data.yml",
       {
         username = "${var.username}"
         password = "${var.password}"

tests/packer/builds.pkr.hcl

@@ -12,51 +12,36 @@ build {
     "source.qemu.ubuntu24",
   ]
 
-  # Upload local files
+  # Upload artifacts
   provisioner "file" {
-    destination = "/tmp"
+    destination = "/tmp/"
-    sources     = ["${path.cwd}/packer/src"]
-  }
-
-  provisioner "file" {
-    only        = ["qemu.archlinux"]
-    destination = "/tmp/src/"
     sources = [
-      "${path.cwd}/../.pkg/apparmor.d-${var.version}-1-x86_64.pkg.tar.zst",
+      "${path.cwd}/packer/src/",
+      "${path.cwd}/packer/init.sh",
+      "${path.cwd}/packer/clean.sh",
+      "${path.cwd}/../.pkg/",
     ]
   }
 
-  provisioner "file" {
+  # Full system provisioning
-    only        = ["qemu.opensuse"]
-    destination = "/tmp/src/"
-    sources     = ["${path.cwd}/../.pkg/apparmor.d-${var.version}-1.x86_64.rpm"]
-  }
-
-  provisioner "file" {
-    only        = ["qemu.debian", "qemu.ubuntu22", "qemu.ubuntu24"]
-    destination = "/tmp/src/"
-    sources     = ["${path.cwd}/../.pkg/apparmor.d_${var.version}-1_amd64.deb"]
-  }
-
-  # Wait for cloud-init to finish
   provisioner "shell" {
     execute_command = "echo '${var.password}' | sudo -S sh -c '{{ .Vars }} {{ .Path }}'"
     inline = [
+      # Wait for cloud-init to finish
       "while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo 'Waiting for Cloud-Init...'; sleep 20; done",
-      "cloud-init clean", # Remove logs and artifacts so cloud-init can re-run
+
-    ]
+      # Ensure cloud-init is successful
-  }
+      "cloud-init status",
+
+      # Remove logs and artifacts so cloud-init can re-run
+      "cloud-init clean",
 
       # Install local files and config
-  provisioner "shell" {
+      "bash /tmp/init.sh",
-    script          = "${path.cwd}/packer/init/init.sh"
-    execute_command = "echo '${var.password}' | sudo -S sh -c '{{ .Vars }} {{ .Path }}'"
-  }
 
       # Minimize the image
-  provisioner "shell" {
+      "bash /tmp/clean.sh",
-    script          = "${path.cwd}/packer/init/clean.sh"
+    ]
-    execute_command = "echo '${var.password}' | sudo -S sh -c '{{ .Vars }} {{ .Path }}'"
   }
 
   post-processor "vagrant" {

tests/packer/clean.sh

@@ -3,7 +3,7 @@
 # Copyright (C) 2023-2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-set -u
+set -eu -o pipefail
 
 # shellcheck source=/dev/null
 _lsb_release() {
@@ -46,23 +46,15 @@ _sshdgenkeys() {
 	_EOF
 }
 
-clean_debian() {
+clean_apt() {
-	_msg "Apt clean configuration"
+	_msg "Cleaning the apt cache"
-
-	_msg "Full system upgrade"
-	apt-get update -y
-	apt-get -qq -y --no-install-recommends upgrade
-	apt-get -qq -y --no-install-recommends dist-upgrade
-
-	_msg "Clean the apt cache"
 	apt-get -y autoremove --purge
 	apt-get -y autoclean
 	apt-get -y clean
 }
 
-clean_arch() {
+clean_pacman() {
-	_msg "Pacman clean configuration"
+	_msg "Cleaning pacman cache"
-
 	pacman -Syu --noconfirm
 	pacman -Qdtq | while IFS='' read -r pkg; do
 		pacman -Rsccn --noconfirm "$pkg"
@@ -70,16 +62,15 @@ clean_arch() {
 	pacman -Scc --noconfirm
 }
 
-clean_opensuse() {
+clean_zypper() {
-	_msg "zypper clean configuration"
+	_msg "Cleaning zypper cache"
-
 	zypper update -y
 	zypper clean -y
 }
 
 # Make the image as impersonal as possible.
 impersonalize() {
-	_msg "Make the image as impersonal as possible."
+	_msg "Making the image as impersonal as possible."
 
 	# Remove remaining pkg file, docs and caches
 	dirs=(
@@ -159,16 +150,16 @@ main() {
 	begin=$(_diskused)
 	case "$DISTRIBUTION" in
 	debian | ubuntu)
-		clean_debian
+		clean_apt
 		_sshdgenkeys
 		;;
 
 	opensuse*)
-		clean_opensuse
+		clean_zypper
 		;;
 
 	arch)
-		clean_arch
+		clean_pacman
 		;;
 	esac
 	impersonalize

tests/packer/debian.pkr.hcl

@@ -6,7 +6,7 @@ source "qemu" "debian" {
   disk_image         = true
   iso_url            = "https://cdimage.debian.org/images/cloud/${var.release.debian.codename}/latest/debian-${var.release.debian.version}-genericcloud-amd64.qcow2"
   iso_checksum       = "file:https://cdimage.debian.org/images/cloud/${var.release.debian.codename}/latest/SHA512SUMS"
-  iso_target_path    = "${var.iso_dir}/debian-cloudimg-amd64.img"
+  iso_target_path    = "${var.iso_dir}/debian-${var.release.debian.codename}-cloudimg-amd64.img"
   cpu_model          = "host"
   cpus               = 6
   memory             = 4096
@@ -28,7 +28,7 @@ source "qemu" "debian" {
   cd_label           = "cidata"
   cd_content = {
     "meta-data" = ""
-    "user-data" = templatefile("${path.cwd}/packer/init/${source.name}-${var.flavor}.user-data.yml",
+    "user-data" = templatefile("${path.cwd}/cloud-init/${source.name}-${var.flavor}.user-data.yml",
       {
         username = "${var.username}"
         password = "${var.password}"

tests/packer/init.sh

@@ -11,7 +11,7 @@ _lsb_release() {
 	echo "$ID"
 }
 DISTRIBUTION="$(_lsb_release)"
-readonly SRC=/tmp/src
+readonly SRC=/tmp/
 readonly DISTRIBUTION
 
 main() {
@@ -28,23 +28,22 @@ main() {
 	case "$DISTRIBUTION" in
 	arch)
 		pacman --noconfirm -U $SRC/*.pkg.tar.zst
-		systemctl start apparmor.service
 		;;
 
 	debian | ubuntu)
-		apt-get update -y
-		apt-get install -y apparmor-profiles build-essential config-package-dev \
-			debhelper devscripts htop rsync vim
 		dpkg -i $SRC/*.deb
 		;;
 
 	opensuse*)
 		mv "/home/$SUDO_USER/.bash_aliases" "/home/$SUDO_USER/.alias"
-		zypper install -y bash-completion git go htop make rsync vim
 		rpm -i $SRC/*.rpm
 		;;
 
 	esac
+
+	rm -rf /var/cache/apparmor/*
+	rm -rf /etc/apparmor/earlypolicy/
+	systemctl reload apparmor.service
 }
 
 main "$@"

tests/packer/opensuse.pkr.hcl

@@ -30,7 +30,7 @@ source "qemu" "opensuse" {
   cd_label           = "cidata"
   cd_content = {
     "meta-data" = ""
-    "user-data" = templatefile("${path.cwd}/packer/init/${source.name}-${var.flavor}.user-data.yml",
+    "user-data" = templatefile("${path.cwd}/cloud-init/${source.name}-${var.flavor}.user-data.yml",
       {
         username = "${var.username}"
         password = "${var.password}"

tests/packer/ubuntu.pkr.hcl

@@ -6,7 +6,7 @@ source "qemu" "ubuntu22" {
   disk_image         = true
   iso_url            = "https://cloud-images.ubuntu.com/${var.release.ubuntu22.codename}/current/${var.release.ubuntu22.codename}-server-cloudimg-amd64.img"
   iso_checksum       = "file:https://cloud-images.ubuntu.com/${var.release.ubuntu22.codename}/current/SHA256SUMS"
-  iso_target_path    = "${var.iso_dir}/ubuntu22-cloudimg-amd64.img"
+  iso_target_path    = "${var.iso_dir}/ubuntu-${var.release.ubuntu22.codename}-cloudimg-amd64.img"
   cpu_model          = "host"
   cpus               = 6
   memory             = 4096
@@ -28,7 +28,7 @@ source "qemu" "ubuntu22" {
   cd_label           = "cidata"
   cd_content = {
     "meta-data" = ""
-    "user-data" = templatefile("${path.cwd}/packer/init/${source.name}-${var.flavor}.user-data.yml",
+    "user-data" = templatefile("${path.cwd}/cloud-init/${source.name}-${var.flavor}.user-data.yml",
       {
         username = "${var.username}"
         password = "${var.password}"
@@ -43,7 +43,7 @@ source "qemu" "ubuntu24" {
   disk_image         = true
   iso_url            = "https://cloud-images.ubuntu.com/${var.release.ubuntu24.codename}/current/${var.release.ubuntu24.codename}-server-cloudimg-amd64.img"
   iso_checksum       = "file:https://cloud-images.ubuntu.com/${var.release.ubuntu24.codename}/current/SHA256SUMS"
-  iso_target_path    = "${var.iso_dir}/ubuntu24-cloudimg-amd64.img"
+  iso_target_path    = "${var.iso_dir}/ubuntu-${var.release.ubuntu24.codename}-cloudimg-amd64.img"
   cpu_model          = "host"
   cpus               = 6
   memory             = 4096
@@ -65,7 +65,7 @@ source "qemu" "ubuntu24" {
   cd_label           = "cidata"
   cd_content = {
     "meta-data" = ""
-    "user-data" = templatefile("${path.cwd}/packer/init/${source.name}-${var.flavor}.user-data.yml",
+    "user-data" = templatefile("${path.cwd}/cloud-init/${source.name}-${var.flavor}.user-data.yml",
       {
         username = "${var.username}"
         password = "${var.password}"

tests/packer/variables.pkr.hcl

@@ -58,12 +58,6 @@ variable "prefix" {
   default     = "aa-"
 }
 
-variable "version" {
-  description = "apparmor.d version"
-  type        = string
-  default     = "0.001"
-}
-
 variable "flavor" {
   description = "Distribution flavor to use (server, desktop, gnome, kde...)"
   type        = string