summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-08-23 15:45:51 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-23 15:45:51 +0000
commit5612ba4811fcc27fb51c61dd18d595d3dfcd098d (patch)
treecd4cc46606dcba7859d080a7029f2374dec29729
parent5065847a3af28f6d465b293cef3b060a8b222e6e (diff)
parente4d5d1d8a97377c5f7c986c4eb1ab6589a0deac3 (diff)
Merge "AArch64: SNAPS: CentOS, Ubuntu image config"
-rw-r--r--functest/ci/config_aarch64_patch.yaml8
-rw-r--r--functest/ci/download_images.sh4
2 files changed, 12 insertions, 0 deletions
diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml
index de82dbc70..6b3699b4d 100644
--- a/functest/ci/config_aarch64_patch.yaml
+++ b/functest/ci/config_aarch64_patch.yaml
@@ -18,6 +18,14 @@ os:
hw_firmware_type: 'uefi'
short_id: 'ubuntu16.04'
hw_video_model: 'vga'
+ ubuntu:
+ disk_file: /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-arm64-uefi1.img
+ extra_properties:
+ hw_firmware_type: 'uefi'
+ hw_video_model: 'vga'
+ centos:
+ disk_file: /home/opnfv/functest/images/CentOS-7-aarch64-GenericCloud.qcow2
+
vping:
image_name: TestVM
diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh
index d92033351..8ef2540c6 100644
--- a/functest/ci/download_images.sh
+++ b/functest/ci/download_images.sh
@@ -15,9 +15,13 @@ http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-lxc.tar.gz
http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-disk.img
http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-initramfs
http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-kernel
+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
EOF
# vnf requires also the next image which cannot be downloaded by jjobs
# http://marketplace.openbaton.org:8082/api/v1/images/52e2ccc0-1dce-4663-894d-28aab49323aa/img
+xz --decompress ${1:-/home/opnfv/functest/images}/CentOS-7-aarch64-GenericCloud.qcow2.xz
+
exit $?