Merge tests: build PAM and apparmor modules in spread

Those fell under the radar during the initial push to expose all of
the tests to spread.

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1493
Approved-by: Christian Boltz <apparmor@cboltz.de>
Merged-by: Zygmunt Krynicki <me@zygoon.pl>

.image-garden.mk

@@ -8,6 +8,7 @@
 define DEBIAN_CLOUD_INIT_USER_DATA_TEMPLATE
 $(CLOUD_INIT_USER_DATA_TEMPLATE)
 packages:
+- apache2-dev
 - attr
 - autoconf
 - autoconf-archive
@@ -20,6 +21,7 @@ packages:
 - flex
 - gettext
 - libdbus-1-dev
+- libpam0g-dev
 - libtool
 - liburing-dev
 - pkg-config
@@ -42,6 +44,7 @@ $(CLOUD_INIT_USER_DATA_TEMPLATE)
 - sed -i -e 's/security=selinux/security=apparmor/g' /etc/default/grub
 - update-bootloader
 packages:
+- apache2-devel
 - attr
 - autoconf
 - autoconf-archive
@@ -58,6 +61,7 @@ packages:
 - libtool
 - liburing2-devel
 - make
+- pam-devel
 - pkg-config
 - python3-devel
 - python3-flake8

spread.yaml

@@ -111,6 +111,9 @@ prepare: |
     make -C $SPREAD_PATH/binutils -j"$(nproc)"
     # Build python utilities.
     make -C $SPREAD_PATH/utils -j"$(nproc)"
+    # Build apache and pam modules.
+    make -C "$SPREAD_PATH"/changehat/mod_apparmor -j"$(nproc)"
+    make -C "$SPREAD_PATH"/changehat/pam_apparmor -j"$(nproc)"
 
 # In case of failure, include the kernel version in the log.
 debug-each: |