summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-08-31 08:41:23 +0200
committerFatih Degirmenci <fdegir@gmail.com>2018-08-31 08:42:35 +0200
commit9582246d06d0ec8975d9ac2ac823e6c8bf8daacd (patch)
tree325c61102f4faa7f7ba9b45d0b7603dea79ee95e
parent9d434f81639e8692826f37e1887c65e29ac28809 (diff)
Download only necessary images for functest-smoke
Functest download_images.sh script downloads images that are not needed for functest-smoke so we only download the necessary images to cut the time down. deploy-scenario:os-nosdn-nofeature installer-type:osa Change-Id: I0be643c4ccd4b8009e68433f5d635231afd2550a Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
-rw-r--r--xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j211
1 files changed, 9 insertions, 2 deletions
diff --git a/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2
index 6e62a3bb..5c6f0168 100644
--- a/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2
+++ b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2
@@ -44,14 +44,21 @@ openstack --insecure subnet create --network {{ external_network }} \
--no-dhcp {{ subnet_name }}
# the needed images differ between the suites so avoid downloading unnecessary images
+echo "Downloading the images needed for functest-$FUNCTEST_SUITE_NAME"
+mkdir ~/images && cd ~/images
if [[ "$FUNCTEST_SUITE_NAME" =~ "healthcheck" ]]; then
- mkdir ~/images && cd ~/images && wget -q http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img && cd ~
+ wget -q http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img
elif [[ "$FUNCTEST_SUITE_NAME" =~ "smoke" ]]; then
- mkdir -p images && wget -q -O- https://git.opnfv.org/functest/plain/functest/ci/download_images.sh | bash -s -- images && ls -1 images/*
+ wget -q http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img \
+ http://testresults.opnfv.org/functest/shaker-image.qcow2 \
+ https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-amd64-disk1.img
else
echo "Unsupported test suite for functest"
exit 1
fi
+echo "------------------------------------------------------"
+ls -al . && cd ~
+echo "------------------------------------------------------"
# docker image to use will be different for healthcheck and smoke test
DOCKER_IMAGE_NAME="ollivier/functest-${FUNCTEST_SUITE_NAME}"