AArch64: Switch jumpserver VMs to virtio video

Drop vgabios dependency by switching video from VGA to virtio for
all VMs spawned on the jumpserver.

NOTE: This requires virtualization packages on the jumpserver to be
up to date (e.g. libvirt, QEMU).

JIRA: ARMBAND-306

Change-Id: I73913e1ae8584f4e73b92994f78f7ec363cba3ec
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit d058675b9a4274336ae3497914d6651f653ccde0)

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 3699bf9..8882cb9 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -269,12 +269,6 @@ pushd "${DEPLOY_DIR}" > /dev/null
 [ -n "$(command -v yum)" ] && sudo yum install -y --skip-broken \
   git make rsync genisoimage curl virt-install qemu-kvm
 
-if [ "$(uname -i)" = "aarch64" ]; then
-  [ -n "$(command -v apt-get)" ] && sudo apt-get install -y vgabios && \
-  sudo ln -sf /usr/share/vgabios/vgabios.bin /usr/share/qemu/vgabios-stdvga.bin
-  [ -n "$(command -v yum)" ] && sudo yum install -y --skip-broken vgabios
-fi
-
 # Clone git submodules and apply our patches
 make -C "${REPO_ROOT_PATH}/mcp/patches" deepclean patches-import
 

diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index a165bb3..b899153 100644 (file)
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -97,8 +97,8 @@ function create_vms {
   # AArch64: prepare arch specific arguments
   local virt_extra_args=""
   if [ "$(uname -i)" = "aarch64" ]; then
-    # No Cirrus VGA on AArch64, use vga std
-    virt_extra_args="$virt_extra_args --video=vga"
+    # No Cirrus VGA on AArch64, use virtio instead
+    virt_extra_args="$virt_extra_args --video=virtio"
   fi
 
   # create vms with specified options