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

tests: Workaround for mkksiso options coming from newer lorax RPM

Browse source
This commit is contained in:
Alexander Todorov 2022-08-02 11:42:54 +03:00 • committed by Jakub Rusz
parent 1ab3138afe
commit a14b76ef61
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
test/cases/installers.sh
View file

@ -13,6 +13,7 @@ set -euo pipefail
# Get OS data. # Get OS data.
source /usr/libexec/osbuild-composer-test/set-env-variables.sh source /usr/libexec/osbuild-composer-test/set-env-variables.sh
source /usr/libexec/tests/osbuild-composer/shared_lib.sh
# Colorful output. # Colorful output.
function greenprint { function greenprint {
@ -64,7 +65,11 @@ echo -e 'admin\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
EOFKS EOFKS
echo "Writing new ISO" echo "Writing new ISO"
sudo mkksiso -c "console=ttyS0,115200" "${newksfile}" "${iso}" "${newiso}" if nvrGreaterOrEqual "lorax" "34.9.18"; then
sudo mkksiso -c "console=ttyS0,115200" --ks "${newksfile}" "${iso}" "${newiso}"
else
sudo mkksiso -c "console=ttyS0,115200" "${newksfile}" "${iso}" "${newiso}"
fi
echo "==== NEW KICKSTART FILE ====" echo "==== NEW KICKSTART FILE ===="
cat "${newksfile}" cat "${newksfile}"

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

@ -6,6 +6,7 @@ set -euo pipefail
# Get OS data. # Get OS data.
source /usr/libexec/osbuild-composer-test/set-env-variables.sh source /usr/libexec/osbuild-composer-test/set-env-variables.sh
source /usr/libexec/tests/osbuild-composer/shared_lib.sh
# Colorful output. # Colorful output.
function greenprint { function greenprint {
@ -194,7 +195,11 @@ ostree remote add --no-gpg-verify --no-sign-verify ${OSTREE_OSNAME} ${PROD_REPO_
EOFKS EOFKS
echo "Writing new ISO" echo "Writing new ISO"
sudo mkksiso -c "console=ttyS0,115200" "${newksfile}" "${iso}" "${newiso}" if nvrGreaterOrEqual "lorax" "34.9.18"; then
sudo mkksiso -c "console=ttyS0,115200" --ks "${newksfile}" "${iso}" "${newiso}"
else
sudo mkksiso -c "console=ttyS0,115200" "${newksfile}" "${iso}" "${newiso}"
fi
echo "==== NEW KICKSTART FILE ====" echo "==== NEW KICKSTART FILE ===="
cat "${newksfile}" cat "${newksfile}"