Skip to content

Commit

Permalink
Merge pull request #4048 from vanhalenar/osinfo
Browse files Browse the repository at this point in the history
USHIFT-4349: Fixed --osinfo=generic warning
  • Loading branch information
openshift-merge-bot[bot] authored Oct 10, 2024
2 parents 6a8309d + 79bfe2f commit e6b2865
Showing 1 changed file with 19 additions and 1 deletion.
20 changes: 19 additions & 1 deletion test/bin/scenario.sh
Original file line number Diff line number Diff line change
Expand Up @@ -533,13 +533,31 @@ launch_vm() {
vm_extra_args="fips=${fips_mode}"
vm_initrd_inject=""

local osname

case "${boot_blueprint}" in
rhel*9*4*)
osname="rhel9.4"
;;
centos9*)
osname="centos-stream9"
;;
*)
record_junit "${vmname}" "osname-parse" "FAILED"
exit 1
;;
esac

record_junit "${vmname}" "osname-parse" "OK"


# Add support of bootc image directory sharing with virtual machines
if [ "${bootc_mode}" -ne 0 ] ; then
# The ISO files generated by bootc-image-builder is not recognized by virt-install.
# Work around the problem by specifying kernel and initrd paths.
if [[ "${boot_blueprint}.iso" == *-bootc.iso ]] ; then
vm_loc_args+=",kernel=images/pxeboot/vmlinuz,initrd=images/pxeboot/initrd.img"
vm_loc_args+=" --osinfo detect=on"
vm_loc_args+=" --osinfo name=${osname}"
fi
fi

Expand Down

0 comments on commit e6b2865

Please sign in to comment.