From c9d249e5e35613aaf7b474c1a19abea0df07fc45 Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Sat, 1 Mar 2025 22:44:56 +0100
Subject: [PATCH] tests(packer): add test images for ubuntu 25.04 & debian 13

---
 .../cloud-init/debian13-server.user-data.yml  | 36 +++++++++++++++++
 .../cloud-init/ubuntu24-desktop.user-data.yml | 39 +++++--------------
 ...ata.yml => ubuntu25-desktop.user-data.yml} | 37 +++++-------------
 3 files changed, 55 insertions(+), 57 deletions(-)
 create mode 100644 tests/cloud-init/debian13-server.user-data.yml
 rename tests/cloud-init/{ubuntu22-desktop.user-data.yml => ubuntu25-desktop.user-data.yml} (53%)

diff --git a/tests/cloud-init/debian13-server.user-data.yml b/tests/cloud-init/debian13-server.user-data.yml
new file mode 100644
index 00000000..1400584b
--- /dev/null
+++ b/tests/cloud-init/debian13-server.user-data.yml
@@ -0,0 +1,36 @@
+#cloud-config
+
+packages:
+  - apparmor-profiles
+  - auditd
+  - build-essential
+  - config-package-dev
+  - debhelper
+  - devscripts
+  - golang-go
+  - htop
+  - qemu-guest-agent
+  - rsync
+  - vim
+
+write_files:
+
+  # Setup shared directory
+  - path: /etc/fstab
+    append: true
+    content: |
+      0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
+
+  # Network configuration
+  - path: /etc/systemd/network/20-wired.network
+    owner: "root:root"
+    permissions: "0644"
+    content: |
+      [Match]
+      Name=en*
+
+      [Network]
+      DHCP=yes
+
+      [DHCPv4]
+      RouteMetric=10
diff --git a/tests/cloud-init/ubuntu24-desktop.user-data.yml b/tests/cloud-init/ubuntu24-desktop.user-data.yml
index 7a71b0af..d1b1f169 100644
--- a/tests/cloud-init/ubuntu24-desktop.user-data.yml
+++ b/tests/cloud-init/ubuntu24-desktop.user-data.yml
@@ -17,29 +17,23 @@ packages:
   - ubuntu-desktop
   - vim
 
-snap:
-  commands:
-    - install firefox
-    - install gtk-common-themes
-    - install snap-store
-    - install snapd-desktop-integration
-
 runcmd:
+  # Add missing snap packages
+  - snap install snap-store
+  - snap install snapd-desktop-integration
+
   # Remove default filesystem and related tools not used with the suggested
   # storage layout. These may yet be required if different partitioning schemes
   # are used.
-  - apt-get -y purge btrfs-progs cryptsetup* lvm2 xfsprogs
+  - apt-get -y purge btrfs-progs xfsprogs
 
   # Remove other packages present by default in Ubuntu Server but not
   # normally present in Ubuntu Desktop.
-  # - >-
-  #   apt-get -y purge
-  #     ubuntu-server ubuntu-server-minimal netplan.io cloud-init
-  #     binutils byobu curl dmeventd finalrd gawk
-  #     kpartx mdadm ncurses-term needrestart open-iscsi
-  #     sg3-utils ssh-import-id sssd thin-provisioning-tools tmux
-  #     sosreport screen open-vm-tools motd-news-config lxd-agent-loader
-  #     landscape-common fonts-ubuntu-console ethtool
+  - >-
+    apt-get -y purge
+      byobu dmeventd finalrd gawk kpartx landscape-common lxd-agent-loader
+      mdadm motd-news-config ncurses-term open-iscsi open-vm-tools
+      screen sg3-utils sosreport ssh-import-id sssd tmux
 
   # Finally, remove things only installed as dependencies of other things
   # we have already removed.
@@ -51,16 +45,3 @@ write_files:
     append: true
     content: |
       0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
-
-  - path: /etc/systemd/network/20-wired.network
-    owner: "root:root"
-    permissions: "0644"
-    content: |
-      [Match]
-      Name=en*
-
-      [Network]
-      DHCP=yes
-
-      [DHCPv4]
-      RouteMetric=10
diff --git a/tests/cloud-init/ubuntu22-desktop.user-data.yml b/tests/cloud-init/ubuntu25-desktop.user-data.yml
similarity index 53%
rename from tests/cloud-init/ubuntu22-desktop.user-data.yml
rename to tests/cloud-init/ubuntu25-desktop.user-data.yml
index 5f4dc69f..881e9b4e 100644
--- a/tests/cloud-init/ubuntu22-desktop.user-data.yml
+++ b/tests/cloud-init/ubuntu25-desktop.user-data.yml
@@ -9,7 +9,7 @@ packages:
   - debhelper
   - devscripts
   - golang-go
-  - linux-generic-hwe-22.04
+  - linux-generic-hwe-24.04
   - qemu-guest-agent
   - rsync
   - spice-vdagent
@@ -17,29 +17,23 @@ packages:
   - ubuntu-desktop
   - vim
 
-snap:
-  commands:
-    - install firefox
-    - install gtk-common-themes
-    - install snap-store
-    - install snapd-desktop-integration
-
 runcmd:
+  - snap install snap-store
+  - snap install snapd-desktop-integration
+  - snap install --edge desktop-security-center
+
   # Remove default filesystem and related tools not used with the suggested
   # storage layout. These may yet be required if different partitioning schemes
   # are used.
-  - apt-get -y purge btrfs-progs cryptsetup* lvm2 xfsprogs
+  - apt-get -y purge btrfs-progs xfsprogs
 
   # Remove other packages present by default in Ubuntu Server but not
   # normally present in Ubuntu Desktop.
   - >-
     apt-get -y purge
-      ubuntu-server ubuntu-server-minimal netplan.io cloud-init
-      binutils byobu curl dmeventd finalrd gawk
-      kpartx mdadm ncurses-term needrestart open-iscsi
-      sg3-utils ssh-import-id sssd thin-provisioning-tools tmux
-      sosreport screen open-vm-tools motd-news-config lxd-agent-loader
-      landscape-common fonts-ubuntu-console ethtool
+      byobu dmeventd finalrd gawk kpartx landscape-common lxd-agent-loader
+      mdadm motd-news-config ncurses-term open-iscsi open-vm-tools
+      screen sg3-utils sosreport ssh-import-id sssd tmux
 
   # Finally, remove things only installed as dependencies of other things
   # we have already removed.
@@ -51,16 +45,3 @@ write_files:
     append: true
     content: |
       0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
-
-  - path: /etc/systemd/network/20-wired.network
-    owner: "root:root"
-    permissions: "0644"
-    content: |
-      [Match]
-      Name=en*
-
-      [Network]
-      DHCP=yes
-
-      [DHCPv4]
-      RouteMetric=10