X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Fdownload_images.sh;h=b7626972e325f3bcb6fcae277fdd0d0077931efb;hb=871400382c339114aedb529a5b6a7bbdd2067b46;hp=f3fdef2e3e76679f6f39fabcf69002753fa704df;hpb=bec2511a842a37429b8343dc5f83b11d96dd47b8;p=functest.git

diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh
old mode 100755
new mode 100644
index f3fdef2e3..b7626972e
--- a/functest/ci/download_images.sh
+++ b/functest/ci/download_images.sh
@@ -1,31 +1,22 @@
 #!/bin/bash
 
-CIRROS_REPO_URL=http://download.cirros-cloud.net
-CIRROS_AARCH64_TAG=161201
-CIRROS_X86_64_TAG=0.3.5
-
-RED='\033[1;31m'
-NC='\033[0m' # No Color
-
-function usage(){
-    echo -e "${RED}USAGE: $script <destination_folder>${NC}"
-    exit 0
-}
-
-script=`basename "$0"`
-IMAGES_FOLDER_DIR=$1
-
-if [[ -z $IMAGES_FOLDER_DIR ]]; then usage; fi;
-
 set -ex
-mkdir -p ${IMAGES_FOLDER_DIR}
-
-wget -nc ${CIRROS_REPO_URL}/${CIRROS_X86_64_TAG}/cirros-${CIRROS_X86_64_TAG}-x86_64-disk.img -P ${IMAGES_FOLDER_DIR}
-wget -nc ${CIRROS_REPO_URL}/${CIRROS_X86_64_TAG}/cirros-${CIRROS_X86_64_TAG}-x86_64-lxc.tar.gz -P ${IMAGES_FOLDER_DIR}
-wget -nc http://artifacts.opnfv.org/sdnvpn/ubuntu-16.04-server-cloudimg-amd64-disk1.img -P ${IMAGES_FOLDER_DIR}
 
-# Add 3rd-party images for aarch64, since Functest can be run on an x86 machine to test an aarch64 POD
-wget -nc ${CIRROS_REPO_URL}/daily/20${CIRROS_AARCH64_TAG}/cirros-d${CIRROS_AARCH64_TAG}-aarch64-disk.img -P ${IMAGES_FOLDER_DIR}
-wget -nc ${CIRROS_REPO_URL}/daily/20${CIRROS_AARCH64_TAG}/cirros-d${CIRROS_AARCH64_TAG}-aarch64-initramfs -P ${IMAGES_FOLDER_DIR}
-wget -nc ${CIRROS_REPO_URL}/daily/20${CIRROS_AARCH64_TAG}/cirros-d${CIRROS_AARCH64_TAG}-aarch64-kernel -P ${IMAGES_FOLDER_DIR}
-set +ex
\ No newline at end of file
+wget_opts="-N --tries=1 --connect-timeout=30"
+
+cat << EOF  | wget ${wget_opts} -i - -P ${1:-/home/opnfv/functest/images}
+http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img
+https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-amd64-disk1.img
+https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2
+https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
+http://repository.cloudifysource.org/cloudify/4.0.1/sp-release/cloudify-manager-premium-4.0.1.qcow2
+http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-aarch64-disk.img
+https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-arm64-uefi1.img
+http://cloud.centos.org/altarch/7/images/aarch64/CentOS-7-aarch64-GenericCloud.qcow2.xz
+https://sourceforge.net/projects/ool-opnfv/files/vyos-1.1.7.img
+http://testresults.opnfv.org/functest/shaker-image.qcow2
+http://testresults.opnfv.org/functest/shaker-image-arm64.qcow2
+EOF
+
+xz --decompress --force --keep \
+    ${1:-/home/opnfv/functest/images}/CentOS-7-aarch64-GenericCloud.qcow2.xz