diff options
| -rwxr-xr-x | ci/deploy.sh | 6 | ||||
| -rw-r--r-- | mcp/scripts/lib.sh | 10 | ||||
| -rwxr-xr-x | mcp/scripts/salt.sh | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 7b3bf54c4..a39d4946b 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -283,6 +283,12 @@ pushd "${DEPLOY_DIR}" > /dev/null [ -n "$(command -v yum)" ] && sudo yum install -y \ 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 vgabios +fi + # Check scenario file existence if [[ ! -f ../config/scenario/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml ]]; then notify "[WARN] ${DEPLOY_SCENARIO}.yaml not found! \ diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 33dba3ccc..8d4510084 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -78,6 +78,13 @@ create_vms() { net_args="${net_args} --network ${net_type}=${net},model=virtio" done + # 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" + fi + # create vms with specified options for node in "${vnodes[@]}"; do # shellcheck disable=SC2086 @@ -88,7 +95,8 @@ create_vms() { --os-type linux --os-variant none \ --boot hd --vnc --console pty --autostart --noreboot \ --disk path="$(pwd)/images/mcp_${node}.iso",device=cdrom \ - --noautoconsole + --noautoconsole \ + ${virt_extra_args} done } diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 8229d2486..36ee27b89 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -48,7 +48,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass cd /srv/salt/scripts - MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=testing ./salt-master-init.sh + MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly ./salt-master-init.sh salt-key -Ay cp -r ${OPNFV_FUEL_DIR}/mcp/salt-formulas/* /usr/share/salt-formulas/env |