mirrors/apparmor.d
1
0
Fork 0
mirror of https://github.com/roddhjav/apparmor.d.git synced 2024-12-24 14:06:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

test: minor test VM creatiom fixes

Browse source
This commit is contained in:
Alexandre Pujol 2023-10-01 16:02:18 +01:00
parent 92bfdfa64a
commit 3372593fc2
Failed to generate hash of commit
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/Makefile
View file

@ -12,8 +12,8 @@
flavor ?= flavor ?=
disk ?= 10G disk ?= 10G
VERSION := 0.$(shell git rev-list --count HEAD)-1 VERSION := 0.$(shell git rev-list --count HEAD)
BASE = archlinux debian ubuntu opensuse BASE = archlinux debian ubuntu opensuse fedora
.PHONY: ${BASE} lint .PHONY: ${BASE} lint

4
tests/packer/builds.pkr.hcl
View file

@ -21,7 +21,7 @@ build {
provisioner "file" { provisioner "file" {
only = ["qemu.archlinux-gnome", "qemu.archlinux-kde"] only = ["qemu.archlinux-gnome", "qemu.archlinux-kde"]
destination = "/tmp/src/" destination = "/tmp/src/"
sources = ["${path.cwd}/../apparmor.d-${var.version}-x86_64.pkg.tar.zst"] sources = ["${path.cwd}/../apparmor.d-${var.version}-1-x86_64.pkg.tar.zst"]
} }
provisioner "file" { provisioner "file" {
@ -33,7 +33,7 @@ build {
provisioner "file" { provisioner "file" {
only = ["qemu.debian-server", "qemu.ubuntu-server", "qemu.ubuntu-desktop"] only = ["qemu.debian-server", "qemu.ubuntu-server", "qemu.ubuntu-desktop"]
destination = "/tmp/src/" destination = "/tmp/src/"
sources = ["${path.cwd}/../apparmor.d_${var.version}_amd64.deb"] sources = ["${path.cwd}/../apparmor.d_${var.version}-1_amd64.deb"]
} }
# Wait for cloud-init to finish # Wait for cloud-init to finish

7
tests/packer/init/init.sh
View file

@ -22,21 +22,20 @@ main() {
install -Dm0644 $SRC/site.local /etc/apparmor.d/tunables/multiarch.d/site.local install -Dm0644 $SRC/site.local /etc/apparmor.d/tunables/multiarch.d/site.local
install -Dm0755 $SRC/aa-update /usr/bin/aa-update install -Dm0755 $SRC/aa-update /usr/bin/aa-update
install -Dm0755 $SRC/aa-log-clean /usr/bin/aa-log-clean install -Dm0755 $SRC/aa-log-clean /usr/bin/aa-log-clean
install -Dm0755 $SRC/aa-test /usr/bin/aa-test
cat $SRC/parser.conf >> /etc/apparmor/parser.conf cat $SRC/parser.conf >> /etc/apparmor/parser.conf
chown -R "$SUDO_USER:$SUDO_USER" "/home/$SUDO_USER/.config/" chown -R "$SUDO_USER:$SUDO_USER" "/home/$SUDO_USER/.config/"
case "$DISTRIBUTION" in case "$DISTRIBUTION" in
arch) pacman --noconfirm -U $SRC/apparmor.d-*-x86_64.pkg.tar.zst ;; arch) pacman --noconfirm -U $SRC/*.pkg.tar.zst ;;
debian | ubuntu) debian | ubuntu)
apt-get update -y apt-get update -y
apt-get install -y apparmor-profiles build-essential config-package-dev \ apt-get install -y apparmor-profiles build-essential config-package-dev \
debhelper devscripts htop rsync vim debhelper devscripts htop rsync vim
dpkg -i $SRC/apparmor.d_*_all.deb dpkg -i $SRC/*.deb
;; ;;
opensuse*) opensuse*)
zypper install -y bash-completion git go htop make rsync vim zypper install -y bash-completion git go htop make rsync vim
sed -i -e '/cache-loc/d' /etc/apparmor/parser.conf sudo rpm -i $SRC/*.rpm
;; ;;
esac esac

1
tests/packer/init/ubuntu-desktop.user-data.yml
View file

@ -37,7 +37,6 @@ packages:
snap: snap:
commands: commands:
- install firefox - install firefox
- install gnome-3-38-2004
- install gtk-common-themes - install gtk-common-themes
- install snap-store - install snap-store
- install snapd-desktop-integration - install snapd-desktop-integration