From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Fri, 27 Oct 2017 09:26:38 +0000 (+0000)
Subject: Merge "AArch64: Switch jumpserver VMs to virtio video"
X-Git-Tag: opnfv-6.0.0~292
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ab9d5af063c243d3201b9405f8781515a08ce0f3;p=fuel.git

Merge "AArch64: Switch jumpserver VMs to virtio video"
---

ab9d5af063c243d3201b9405f8781515a08ce0f3
diff --cc ci/deploy.sh
index 9a28b5ade,8882cb9c2..97c4de0e3
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@@ -265,16 -265,10 +265,10 @@@ pushd "${DEPLOY_DIR}" > /dev/nul
  
  # Install required packages
  [ -n "$(command -v apt-get)" ] && sudo apt-get install -y \
 -  git make rsync mkisofs curl virtinst cpu-checker qemu-kvm
 +  git make rsync mkisofs curl virtinst cpu-checker qemu-kvm uuid-runtime
  [ -n "$(command -v yum)" ] && sudo yum install -y --skip-broken \
 -  git make rsync genisoimage curl virt-install qemu-kvm
 +  git make rsync genisoimage curl virt-install qemu-kvm util-linux
  
- 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