From 9110a7012441a1f57566361cc05c65d11a189fb7 Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Sun, 17 Aug 2025 00:16:31 +0200
Subject: [PATCH] tests: add debian/ubuntu based tests images.

Also some cleanup of tests resources.
---
 .gitignore                                      | 1 +
 tests/cloud-init/debian.yml                     | 5 +++--
 tests/cloud-init/debian13-kde.user-data.yml     | 9 +++++++++
 tests/cloud-init/ubuntu.yml                     | 1 +
 tests/cloud-init/ubuntu24-kubuntu.user-data.yml | 1 +
 tests/cloud-init/ubuntu25-kubuntu.user-data.yml | 9 +++++++++
 tests/packer/clean.sh                           | 1 -
 tests/packer/init.sh                            | 5 +++--
 tests/packer/variables.pkr.hcl                  | 4 ++--
 tests/requirements.sh                           | 2 +-
 10 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 tests/cloud-init/debian13-kde.user-data.yml
 create mode 100644 tests/cloud-init/ubuntu25-kubuntu.user-data.yml

diff --git a/.gitignore b/.gitignore
index d888d6d5c..077d62cbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # Build
 .build
 .logs
+.pkg
 tests/tldr
 tests/tldr.tar.gz
 
diff --git a/tests/cloud-init/debian.yml b/tests/cloud-init/debian.yml
index ea3012ad2..b96bb5880 100644
--- a/tests/cloud-init/debian.yml
+++ b/tests/cloud-init/debian.yml
@@ -23,7 +23,7 @@ core-packages: &core-packages
   - unattended-upgrades
   - vim
 
-gnome-packages: &desktop-packages
+gnome-packages: &gnome-packages
   # Core packages for Debian
   - apparmor-profiles
   - apparmor-utils
@@ -53,7 +53,7 @@ gnome-packages: &desktop-packages
   - loupe
   - ptyxis
 
-kde-packages: &kubuntu-packages
+kde-packages: &kde-packages
   # Core packages for Debian
   - apparmor-profiles
   - apparmor-utils
@@ -79,6 +79,7 @@ kde-packages: &kubuntu-packages
   # KDE packages for Debian
   - spice-vdagent
   - task-kde-desktop
+  - plasma-workspace-wayland
   - terminator
 
 debian12-runcmd: &debian12-runcmd
diff --git a/tests/cloud-init/debian13-kde.user-data.yml b/tests/cloud-init/debian13-kde.user-data.yml
new file mode 100644
index 000000000..5a4d33bf5
--- /dev/null
+++ b/tests/cloud-init/debian13-kde.user-data.yml
@@ -0,0 +1,9 @@
+#cloud-config
+
+packages: *kde-packages
+
+runcmd: *debian13-runcmd
+
+write_files:
+  - *shared-directory    # Setup shared directory
+  - *systemd-netword     # Network configuration for server
diff --git a/tests/cloud-init/ubuntu.yml b/tests/cloud-init/ubuntu.yml
index 14db33251..1f3563750 100644
--- a/tests/cloud-init/ubuntu.yml
+++ b/tests/cloud-init/ubuntu.yml
@@ -82,6 +82,7 @@ kubuntu-packages: &kubuntu-packages
   - spice-vdagent
   - terminator
   - kubuntu-desktop
+  - plasma-workspace-wayland
 
 desktop-runcmd: &desktop-runcmd
   # Add missing snap packages
diff --git a/tests/cloud-init/ubuntu24-kubuntu.user-data.yml b/tests/cloud-init/ubuntu24-kubuntu.user-data.yml
index d4139c2f7..bea74af3a 100644
--- a/tests/cloud-init/ubuntu24-kubuntu.user-data.yml
+++ b/tests/cloud-init/ubuntu24-kubuntu.user-data.yml
@@ -6,3 +6,4 @@ runcmd: *desktop-runcmd
 
 write_files:
   - *shared-directory  # Setup shared directory
+  - *systemd-netword   # Network configuration for server
diff --git a/tests/cloud-init/ubuntu25-kubuntu.user-data.yml b/tests/cloud-init/ubuntu25-kubuntu.user-data.yml
new file mode 100644
index 000000000..bea74af3a
--- /dev/null
+++ b/tests/cloud-init/ubuntu25-kubuntu.user-data.yml
@@ -0,0 +1,9 @@
+#cloud-config
+
+packages: *kubuntu-packages
+
+runcmd: *desktop-runcmd
+
+write_files:
+  - *shared-directory  # Setup shared directory
+  - *systemd-netword   # Network configuration for server
diff --git a/tests/packer/clean.sh b/tests/packer/clean.sh
index b7650a1d5..f7518a2f6 100644
--- a/tests/packer/clean.sh
+++ b/tests/packer/clean.sh
@@ -55,7 +55,6 @@ clean_apt() {
 
 clean_pacman() {
 	_msg "Cleaning pacman cache"
-	pacman -Syu --noconfirm
 	pacman -Scc --noconfirm
 }
 
diff --git a/tests/packer/init.sh b/tests/packer/init.sh
index 4e4e1ec99..bf75c0e1e 100644
--- a/tests/packer/init.sh
+++ b/tests/packer/init.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2023-2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-set -eu
+set -eux
 
 _lsb_release() {
 	# shellcheck source=/dev/null
@@ -31,7 +31,8 @@ main() {
 		;;
 
 	debian | ubuntu)
-		dpkg -i $SRC/*.deb
+		apt install -y apparmor-profiles
+		dpkg -i $SRC/*.deb || true
 		;;
 
 	opensuse*)
diff --git a/tests/packer/variables.pkr.hcl b/tests/packer/variables.pkr.hcl
index 073544f59..a44f98412 100644
--- a/tests/packer/variables.pkr.hcl
+++ b/tests/packer/variables.pkr.hcl
@@ -98,8 +98,8 @@ variable "DM" {
       img_checksum = "https://cdimage.debian.org/images/cloud/bookworm/latest/SHA512SUMS"
     }
     "debian13" : {
-      img_url      = "https://cdimage.debian.org/images/cloud/trixie/daily/latest/debian-13-genericcloud-amd64-daily.qcow2"
-      img_checksum = "https://cdimage.debian.org/images/cloud/trixie/daily/latest/SHA512SUMS"
+      img_url      = "https://cdimage.debian.org/images/cloud/trixie/latest/debian-13-genericcloud-amd64.qcow2"
+      img_checksum = "https://cdimage.debian.org/images/cloud/trixie/latest/SHA512SUMS"
     }
     "ubuntu22" : {
       img_url      = "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
diff --git a/tests/requirements.sh b/tests/requirements.sh
index efc357ad4..0801ff27d 100644
--- a/tests/requirements.sh
+++ b/tests/requirements.sh
@@ -5,7 +5,7 @@
 
 # Dependencies for the bats integration tests
 
-set -eu
+set -eu -o pipefail
 
 # shellcheck source=/dev/null
 _lsb_release() {