diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-27 16:56:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-27 16:56:59 +0000 |
| commit | 4401837178770d50b2d1579a01fb7e6aaca37907 (patch) | |
| tree | 39ea40403f3f8ff81af003383053d5d273124c33 | |
| parent | b6e65dbb9952aeafeff6fcc07b6dcd97940d62ff (diff) | |
| parent | 18ca1ba6b3a85c40c7eab9dc0e32c80032941184 (diff) | |
Merge "AArch64: Switch jumpserver VMs to virtio video" into stable/euphrates
| -rwxr-xr-x | ci/deploy.sh | 6 | ||||
| -rw-r--r-- | mcp/scripts/lib.sh | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 9a28b5ade..97c4de0e3 100755 --- 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 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 diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index a165bb367..b8991534b 100644 --- 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 |