tests: add debian/ubuntu based tests images.
Also some cleanup of tests resources.
This commit is contained in:
parent
7c427aaae6
commit
9110a70124
10 changed files with 30 additions and 8 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,6 +1,7 @@
|
||||||
# Build
|
# Build
|
||||||
.build
|
.build
|
||||||
.logs
|
.logs
|
||||||
|
.pkg
|
||||||
tests/tldr
|
tests/tldr
|
||||||
tests/tldr.tar.gz
|
tests/tldr.tar.gz
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ core-packages: &core-packages
|
||||||
- unattended-upgrades
|
- unattended-upgrades
|
||||||
- vim
|
- vim
|
||||||
|
|
||||||
gnome-packages: &desktop-packages
|
gnome-packages: &gnome-packages
|
||||||
# Core packages for Debian
|
# Core packages for Debian
|
||||||
- apparmor-profiles
|
- apparmor-profiles
|
||||||
- apparmor-utils
|
- apparmor-utils
|
||||||
|
|
@ -53,7 +53,7 @@ gnome-packages: &desktop-packages
|
||||||
- loupe
|
- loupe
|
||||||
- ptyxis
|
- ptyxis
|
||||||
|
|
||||||
kde-packages: &kubuntu-packages
|
kde-packages: &kde-packages
|
||||||
# Core packages for Debian
|
# Core packages for Debian
|
||||||
- apparmor-profiles
|
- apparmor-profiles
|
||||||
- apparmor-utils
|
- apparmor-utils
|
||||||
|
|
@ -79,6 +79,7 @@ kde-packages: &kubuntu-packages
|
||||||
# KDE packages for Debian
|
# KDE packages for Debian
|
||||||
- spice-vdagent
|
- spice-vdagent
|
||||||
- task-kde-desktop
|
- task-kde-desktop
|
||||||
|
- plasma-workspace-wayland
|
||||||
- terminator
|
- terminator
|
||||||
|
|
||||||
debian12-runcmd: &debian12-runcmd
|
debian12-runcmd: &debian12-runcmd
|
||||||
|
|
|
||||||
9
tests/cloud-init/debian13-kde.user-data.yml
Normal file
9
tests/cloud-init/debian13-kde.user-data.yml
Normal file
|
|
@ -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
|
||||||
|
|
@ -82,6 +82,7 @@ kubuntu-packages: &kubuntu-packages
|
||||||
- spice-vdagent
|
- spice-vdagent
|
||||||
- terminator
|
- terminator
|
||||||
- kubuntu-desktop
|
- kubuntu-desktop
|
||||||
|
- plasma-workspace-wayland
|
||||||
|
|
||||||
desktop-runcmd: &desktop-runcmd
|
desktop-runcmd: &desktop-runcmd
|
||||||
# Add missing snap packages
|
# Add missing snap packages
|
||||||
|
|
|
||||||
|
|
@ -6,3 +6,4 @@ runcmd: *desktop-runcmd
|
||||||
|
|
||||||
write_files:
|
write_files:
|
||||||
- *shared-directory # Setup shared directory
|
- *shared-directory # Setup shared directory
|
||||||
|
- *systemd-netword # Network configuration for server
|
||||||
|
|
|
||||||
9
tests/cloud-init/ubuntu25-kubuntu.user-data.yml
Normal file
9
tests/cloud-init/ubuntu25-kubuntu.user-data.yml
Normal file
|
|
@ -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
|
||||||
|
|
@ -55,7 +55,6 @@ clean_apt() {
|
||||||
|
|
||||||
clean_pacman() {
|
clean_pacman() {
|
||||||
_msg "Cleaning pacman cache"
|
_msg "Cleaning pacman cache"
|
||||||
pacman -Syu --noconfirm
|
|
||||||
pacman -Scc --noconfirm
|
pacman -Scc --noconfirm
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
# Copyright (C) 2023-2024 Alexandre Pujol <alexandre@pujol.io>
|
# Copyright (C) 2023-2024 Alexandre Pujol <alexandre@pujol.io>
|
||||||
# SPDX-License-Identifier: GPL-2.0-only
|
# SPDX-License-Identifier: GPL-2.0-only
|
||||||
|
|
||||||
set -eu
|
set -eux
|
||||||
|
|
||||||
_lsb_release() {
|
_lsb_release() {
|
||||||
# shellcheck source=/dev/null
|
# shellcheck source=/dev/null
|
||||||
|
|
@ -31,7 +31,8 @@ main() {
|
||||||
;;
|
;;
|
||||||
|
|
||||||
debian | ubuntu)
|
debian | ubuntu)
|
||||||
dpkg -i $SRC/*.deb
|
apt install -y apparmor-profiles
|
||||||
|
dpkg -i $SRC/*.deb || true
|
||||||
;;
|
;;
|
||||||
|
|
||||||
opensuse*)
|
opensuse*)
|
||||||
|
|
|
||||||
|
|
@ -98,8 +98,8 @@ variable "DM" {
|
||||||
img_checksum = "https://cdimage.debian.org/images/cloud/bookworm/latest/SHA512SUMS"
|
img_checksum = "https://cdimage.debian.org/images/cloud/bookworm/latest/SHA512SUMS"
|
||||||
}
|
}
|
||||||
"debian13" : {
|
"debian13" : {
|
||||||
img_url = "https://cdimage.debian.org/images/cloud/trixie/daily/latest/debian-13-genericcloud-amd64-daily.qcow2"
|
img_url = "https://cdimage.debian.org/images/cloud/trixie/latest/debian-13-genericcloud-amd64.qcow2"
|
||||||
img_checksum = "https://cdimage.debian.org/images/cloud/trixie/daily/latest/SHA512SUMS"
|
img_checksum = "https://cdimage.debian.org/images/cloud/trixie/latest/SHA512SUMS"
|
||||||
}
|
}
|
||||||
"ubuntu22" : {
|
"ubuntu22" : {
|
||||||
img_url = "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
|
img_url = "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
# Dependencies for the bats integration tests
|
# Dependencies for the bats integration tests
|
||||||
|
|
||||||
set -eu
|
set -eu -o pipefail
|
||||||
|
|
||||||
# shellcheck source=/dev/null
|
# shellcheck source=/dev/null
|
||||||
_lsb_release() {
|
_lsb_release() {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue