summaryrefslogtreecommitdiffstats
path: root/xci
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-03-12 08:43:53 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-12 08:43:53 +0000
commited1c2d6c009bdf8ec6a75e34a1fdbefe0ce6f7d7 (patch)
tree9d8d867e20208dfa8a3ebf18dfdd07533ed55dd1 /xci
parent75e75b5a411c376c52e9117742016b39a25a6ec3 (diff)
parent64521b0464b460f4056ad24719ee231cbb2079eb (diff)
Merge "xci: scripts: vm: Update package manager cache and ignore errors"
Diffstat (limited to 'xci')
-rwxr-xr-xxci/scripts/vm/start-new-vm.sh14
1 files changed, 10 insertions, 4 deletions
diff --git a/xci/scripts/vm/start-new-vm.sh b/xci/scripts/vm/start-new-vm.sh
index 868de6c3..76506830 100755
--- a/xci/scripts/vm/start-new-vm.sh
+++ b/xci/scripts/vm/start-new-vm.sh
@@ -119,13 +119,17 @@ COMMON_DISTRO_PKGS=(vim strace gdb htop dnsmasq docker iptables ebtables virt-ma
case ${ID,,} in
*suse)
- pkg_mgr_cmd="sudo zypper -q -n install ${COMMON_DISTRO_PKGS[@]} qemu-kvm qemu-tools libvirt-daemon libvirt-client libvirt-daemon-driver-qemu"
+ pkg_mgr_cmd="sudo zypper -q -n ref"
+ pkg_mgr_cmd+=" && sudo zypper -q -n install ${COMMON_DISTRO_PKGS[@]} qemu-kvm qemu-tools libvirt-daemon libvirt-client libvirt-daemon-driver-qemu"
;;
centos)
- pkg_mgr_cmd="sudo yum install -q -y epel-release && sudo yum install -q -y in ${COMMON_DISTRO_PKGS[@]} qemu-kvm-tools qemu-img libvirt-daemon-kvm"
+ pkg_mgr_cmd="yum updateinfo"
+ pkg_mgr_cmd+=" && sudo yum install -q -y epel-release"
+ pkg_mgr_cmd+=" && sudo yum install -q -y in ${COMMON_DISTRO_PKGS[@]} qemu-kvm-tools qemu-img libvirt-daemon-kvm"
;;
ubuntu)
- pkg_mgr_cmd="sudo apt-get install -y -q=3 ${COMMON_DISTRO_PKGS[@]} libvirt-bin qemu-utils docker.io"
+ pkg_mgr_cmd="sudo apt-get update"
+ pkg_mgr_cmd+=" && sudo apt-get install -y -q=3 ${COMMON_DISTRO_PKGS[@]} libvirt-bin qemu-utils docker.io"
;;
esac
@@ -141,7 +145,9 @@ while true; do
done
echo "Installing host (${ID,,}) dependencies..."
-eval ${pkg_mgr_cmd} &> /dev/null
+set +e
+eval ${pkg_mgr_cmd}
+set -e
echo "Ensuring libvirt and docker services are running..."
sudo systemctl -q start libvirtd