diff --git a/setup b/setup index 356fbfcc..8f916ab1 100755 --- a/setup +++ b/setup @@ -251,7 +251,7 @@ EOF fi fi - cmd_dnf_install="dnf -y install --releasever=${VERSION_ID} --setopt=reposdir=${ROOTFS}/etc/yum.repos.d --installroot ${ROOTFS} libkrun crun-krun bluechi-agent ${EXTRA_FLAG}" + cmd_dnf_install="dnf -y install --releasever=${VERSION_ID} --setopt=reposdir=${ROOTFS}/etc/yum.repos.d --installroot ${ROOTFS} bluechi-agent ${EXTRA_FLAG}" ${cmd_dnf_install} dnf -y update --installroot "${ROOTFS}" diff --git a/tests/qm-kvm-test/libkrun/check_libkrun.sh b/tests/qm-kvm-test/libkrun/check_libkrun.sh index 3e482e33..3db867d2 100644 --- a/tests/qm-kvm-test/libkrun/check_libkrun.sh +++ b/tests/qm-kvm-test/libkrun/check_libkrun.sh @@ -11,7 +11,18 @@ enable_repo() { install_libkrun() { info_message "install_libkrun(): install libkrun and crun-krun" - exec_cmd "dnf install --setopt=reposdir=/etc/yum.repos.d --installroot=/usr/lib/qm/rootfs -y libkrun crun-krun" + # Adding rawhide as 1.17 fixes Internal(Vm(SetMemoryAttributes(Error(22)))) + # See-Also: https://github.com/containers/qm/pull/959 + if grep -qi "^ID=fedora" /etc/os-release; then + # Need the remove as soon the land in stable channel + exec_cmd "dnf install --installroot=/usr/lib/qm/rootfs -y fedora-repos-rawhide" + fi + exec_cmd "cat /usr/lib/qm/rootfs/etc/yum.repos.d/*" + exec_cmd "dnf repolist --all --setopt=reposdir=/etc/yum.repos.d" + if grep -qi "^ID=fedora" /etc/os-release; then + exec_cmd "dnf install --enablerepo=rawhide --setopt=reposdir=/etc/yum.repos.d --installroot=/usr/lib/qm/rootfs -y libkrun crun-krun libkrunfw" + fi + #exec_cmd "dnf install --use-host-config --releasever=rawhide --enablerepo=rawhide --setopt=reposdir=/etc/yum.repos.d --installroot=/usr/lib/qm/rootfs -y libkrun crun-krun libkrunfw" } check_libkrun() { @@ -20,7 +31,10 @@ check_libkrun() { info_message "PASS: libkrun runs successfully." } -enable_repo +if grep -qi "^ID=centos" /etc/os-release; then + enable_repo +fi + install_libkrun check_libkrun