From d9905252c2f6bdb2aa840b4a697bc05392af21a6 Mon Sep 17 00:00:00 2001 From: Anders Roxell Date: Thu, 19 Dec 2013 22:11:42 +0100 Subject: kvm/test-kvm.sh: fallback to use wget Need curl on some OE images due to busybox wget don't support https links. Change-Id: Iea0da72b97516e1806c2680866f3ff4479131bb6 Signed-off-by: Anders Roxell --- common/scripts/kvm/test-kvm.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'common/scripts/kvm') diff --git a/common/scripts/kvm/test-kvm.sh b/common/scripts/kvm/test-kvm.sh index e9d3e20..2df1c7d 100755 --- a/common/scripts/kvm/test-kvm.sh +++ b/common/scripts/kvm/test-kvm.sh @@ -13,13 +13,19 @@ fi dmesg|grep 'Hyp mode initialized successfully' && echo "$KVM_INIT pass" || echo "$KVM_INIT fail" -BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/linux-vexpress-kvm/lastSuccessfulBuild/buildNumber` +if hash curl 2>/dev/null; then + EXTRACT_BUILD_NUMBER="curl -s" + DOWNLOAD_FILE="curl -SO" +else + EXTRACT_BUILD_NUMBER="wget -q --no-check-certificate -O -" + DOWNLOAD_FILE="wget --progress=dot -e dotbytes=2M --no-check-certificate" +fi -WGET="wget --progress=dot -e dotbytes=2M --no-check-certificate" +BUILD_NUMBER=`$(echo $EXTRACT_BUILD_NUMBER) https://ci.linaro.org/jenkins/job/linux-vexpress-kvm/lastSuccessfulBuild/buildNumber` -$WGET http://snapshots.linaro.org/ubuntu/images/kvm/$BUILD_NUMBER/kvm.qcow2.gz -$WGET http://snapshots.linaro.org/ubuntu/images/kvm/$BUILD_NUMBER/zImage -$WGET http://snapshots.linaro.org/ubuntu/images/kvm/$BUILD_NUMBER/vexpress-v2p-ca15-tc1.dtb +$DOWNLOAD_FILE http://snapshots.linaro.org/ubuntu/images/kvm/$BUILD_NUMBER/kvm.qcow2.gz +$DOWNLOAD_FILE http://snapshots.linaro.org/ubuntu/images/kvm/$BUILD_NUMBER/zImage +$DOWNLOAD_FILE http://snapshots.linaro.org/ubuntu/images/kvm/$BUILD_NUMBER/vexpress-v2p-ca15-tc1.dtb gunzip kvm.qcow2.gz modprobe nbd max_part=16 -- cgit v1.2.3