particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test/cases: make fedora conditions generic for all versions

Browse source 
To save us some work when updating the tests.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2023-06-06 13:38:31 +02:00 • committed by Achilleas Koutsou
parent dda50003cb
commit 3fb55413dc
3 changed files with 10 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/cases/minimal-raw.sh
View file

@ -73,16 +73,12 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa
SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
EDGE_USER_PASSWORD=foobar
case "${ID}-${VERSION_ID}" in
"fedora-37")
# CI runner does not support fedora37 os name in this case
# ERROR Unknown OS name 'fedora37'. See `--osinfo list` for valid values.
OS_VARIANT="fedora-unknown"
;;
*)
echo "unsupported distro: ${ID}-${VERSION_ID}"
exit 1;;
esac
if [[ $ID != fedora ]]; then
echo "unsupported distro: ${ID}-${VERSION_ID}"
exit 1
fi
OS_VARIANT="fedora-unknown"
# Get the compose log.
get_compose_log () {

12
test/cases/ostree-ng.sh
View file

@ -106,17 +106,7 @@ KERNEL_RT_PKG="kernel-rt"
SYSROOT_RO="false"
case "${ID}-${VERSION_ID}" in
"fedora-37")
CONTAINER_TYPE=iot-container
INSTALLER_TYPE=iot-installer
OSTREE_REF="fedora/${VERSION_ID}/${ARCH}/iot"
OSTREE_OSNAME=fedora
OS_VARIANT="fedora-unknown"
EMBEDED_CONTAINER="false"
DIRS_FILES_CUSTOMIZATION="true"
SYSROOT_RO="true"
;;
"fedora-38")
fedora-*)
CONTAINER_TYPE=iot-container
INSTALLER_TYPE=iot-installer
OSTREE_REF="fedora/${VERSION_ID}/${ARCH}/iot"

17
test/cases/ostree.sh
View file

@ -19,23 +19,12 @@ SYSROOT_RO="false"
# Set os-variant and boot location used by virt-install.
case "${ID}-${VERSION_ID}" in
"fedora-37")
fedora-*)
IMAGE_TYPE=iot-commit
OSTREE_REF="fedora/37/${ARCH}/iot"
OSTREE_REF="fedora/${VERSION_ID}/${ARCH}/iot"
OS_VARIANT="fedora-unknown"
USER_IN_COMMIT="false"
BOOT_LOCATION="https://mirrors.kernel.org/fedora/releases/37/Everything/x86_64/os/"
EMBEDED_CONTAINER="false"
FIREWALL_FEATURE="false"
DIRS_FILES_CUSTOMIZATION="true"
SYSROOT_RO="true"
;;
"fedora-38")
IMAGE_TYPE=iot-commit
OSTREE_REF="fedora/38/${ARCH}/iot"
OS_VARIANT="fedora-unknown"
USER_IN_COMMIT="false"
BOOT_LOCATION="https://mirrors.kernel.org/fedora/releases/38/Everything/x86_64/os/"
BOOT_LOCATION="https://mirrors.kernel.org/fedora/releases/${VERSION_ID}/Everything/x86_64/os/"
EMBEDED_CONTAINER="false"
FIREWALL_FEATURE="false"
DIRS_FILES_CUSTOMIZATION="true"