diff --git a/tests/boxes.yml b/tests/boxes.yml index 9846342c..edda4109 100644 --- a/tests/boxes.yml +++ b/tests/boxes.yml @@ -2,7 +2,7 @@ defaults: uefi: true - ram: '6144' + ram: '4096' cpu: '6' boxes: @@ -14,6 +14,10 @@ boxes: box: aa-archlinux-kde uefi: false + - name: arch-xfce + box: aa-archlinux-xfce + uefi: false + - name: arch-server box: aa-archlinux-server uefi: false diff --git a/tests/packer/init/archlinux-gnome.user-data.yml b/tests/packer/init/archlinux-gnome.user-data.yml index 855bc58e..c65dfc4d 100644 --- a/tests/packer/init/archlinux-gnome.user-data.yml +++ b/tests/packer/init/archlinux-gnome.user-data.yml @@ -77,7 +77,7 @@ write_files: - path: /etc/default/grub append: true content: | - GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT lsm=landlock,lockdown,yama,integrity,apparmor,bpf" + GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT lsm=landlock,lockdown,yama,integrity,apparmor,bpf apparmor.debug=1" # Set some bash aliases - path: /etc/skel/.bashrc diff --git a/tests/packer/init/archlinux-kde.user-data.yml b/tests/packer/init/archlinux-kde.user-data.yml index a85ca16d..97e8ffa7 100644 --- a/tests/packer/init/archlinux-kde.user-data.yml +++ b/tests/packer/init/archlinux-kde.user-data.yml @@ -79,7 +79,7 @@ write_files: - path: /etc/default/grub append: true content: | - GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT lsm=landlock,lockdown,yama,integrity,apparmor,bpf" + GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT lsm=landlock,lockdown,yama,integrity,apparmor,bpf apparmor.debug=1" # Set some bash aliases - path: /etc/skel/.bashrc diff --git a/tests/packer/init/archlinux-server.user-data.yml b/tests/packer/init/archlinux-server.user-data.yml index 034cd22d..93fd254a 100644 --- a/tests/packer/init/archlinux-server.user-data.yml +++ b/tests/packer/init/archlinux-server.user-data.yml @@ -56,7 +56,7 @@ write_files: - path: /etc/default/grub append: true content: | - GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT lsm=landlock,lockdown,yama,integrity,apparmor,bpf" + GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT lsm=landlock,lockdown,yama,integrity,apparmor,bpf apparmor.debug=1" # Set some bash aliases - path: /etc/skel/.bashrc diff --git a/tests/packer/init/init.sh b/tests/packer/init/init.sh index 6a80b199..df300c0c 100644 --- a/tests/packer/init/init.sh +++ b/tests/packer/init/init.sh @@ -24,8 +24,13 @@ main() { install -Dm0755 $SRC/aa-log-clean /usr/bin/aa-log-clean cat $SRC/parser.conf >>/etc/apparmor/parser.conf chown -R "$SUDO_USER:$SUDO_USER" "/home/$SUDO_USER/.config/" + case "$DISTRIBUTION" in - arch) pacman --noconfirm -U $SRC/*.pkg.tar.zst ;; + 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 \ @@ -34,8 +39,9 @@ main() { ;; opensuse*) + mv "/home/$SUDO_USER/.bash_aliases" "/home/$SUDO_USER/.alias" zypper install -y bash-completion git go htop make rsync vim - sudo rpm -i $SRC/*.rpm + rpm -i $SRC/*.rpm ;; esac diff --git a/tests/packer/init/opensuse-kde.user-data.yml b/tests/packer/init/opensuse-kde.user-data.yml index 6c1c7cff..b54bb458 100644 --- a/tests/packer/init/opensuse-kde.user-data.yml +++ b/tests/packer/init/opensuse-kde.user-data.yml @@ -19,12 +19,14 @@ package_update: true package_upgrade: true package_reboot_if_required: false packages: + - apparmor-profiles - bash-completion + - distribution-release - git - - go + - golang-packaging - htop - make - - rsync + - rpmbuild - vim write_files: