github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-05-01 05:04:26 +00:00
Code Issues Projects Releases Wiki Activity

tests/vfio: Move dependency installation to gha-run.sh

Browse Source 
To match the flow of other github actions workflows.

Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
This commit is contained in:
Jeremi Piotrowski 2023-08-23 16:59:26 +02:00
parent 5a551a85b1
commit a92ddeea15
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/functional/vfio/gha-run.sh
View File

@ -15,6 +15,28 @@ source "${vfio_dir}/../../common.bash"
function install_dependencies() { function install_dependencies() {
info "Installing the dependencies needed for running the vfio tests" info "Installing the dependencies needed for running the vfio tests"
(
source /etc/os-release || source /usr/lib/os-release
case "${ID}" in
ubuntu)
# cloud image dependencies
deps=(xorriso curl qemu-utils openssh-client)
sudo apt-get update
sudo apt-get install -y ${deps[@]} qemu-system-x86
;;
fedora)
# cloud image dependencies
deps=(xorriso curl qemu-img openssh)
sudo dnf install -y ${deps[@]} qemu-system-x86-core
;;
"*")
die "Unsupported distro: ${ID}"
;;
esac
)
} }
function run() { function run() {

26
tests/functional/vfio/vfio_fedora_vm_wrapper.sh
View File

@ -244,30 +244,6 @@ run_vm() {
-device virtio-net-pci,netdev=net1,disable-legacy=on,disable-modern="${disable_modern}",iommu_platform=on,ats=on -device virtio-net-pci,netdev=net1,disable-legacy=on,disable-modern="${disable_modern}",iommu_platform=on,ats=on
} }
install_dependencies() {
case "${ID}" in
ubuntu)
# cloud image dependencies
deps=(xorriso curl qemu-utils openssh-client)
sudo apt-get update
sudo apt-get install -y ${deps[@]}
sudo apt-get install --reinstall -y qemu-system-x86
;;
fedora)
# cloud image dependencies
deps=(xorriso curl qemu-img openssh)
sudo dnf install -y ${deps[@]} qemu-system-x86-core
sudo dnf reinstall -y qemu-system-x86-core
;;
"*")
die "Unsupported distro: ${ID}"
;;
esac
}
ssh_vm() { ssh_vm() {
cmd=$@ cmd=$@
ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i "${ssh_key_file}" -p "${vm_port}" "${USER}@${vm_ip}" "${cmd}" ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i "${ssh_key_file}" -p "${vm_port}" "${USER}@${vm_ip}" "${cmd}"
@ -298,8 +274,6 @@ main() {
mkdir -p "${data_dir}" mkdir -p "${data_dir}"
install_dependencies
create_ssh_key create_ssh_key
create_config_iso "${config_iso_file}" create_config_iso "${config_iso_file}"