diff options
Diffstat (limited to 'functest/ci')
| -rw-r--r-- | functest/ci/config_aarch64_patch.yaml | 8 | ||||
| -rw-r--r-- | functest/ci/config_functest.yaml | 18 | ||||
| -rwxr-xr-x | functest/ci/download_images.sh | 7 |
3 files changed, 13 insertions, 20 deletions
diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml index 80cf4ccc..45af8d74 100644 --- a/functest/ci/config_aarch64_patch.yaml +++ b/functest/ci/config_aarch64_patch.yaml @@ -5,14 +5,6 @@ os: image_file_name: cirros-d161201-aarch64-disk.img image_password: gocubsgo - snaps_health_check: - disk_url: http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-disk.img - kernel_url: http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-kernel - ramdisk_url: http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-initramfs - extra_properties: - os_command_line: root=/dev/vdb1 rw rootwait console=tty0 console=ttyS0 console=ttyAMA0 - hw_video_model: vga - vping: image_name: TestVM diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index 42daaa16..b93730cd 100644 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -12,7 +12,6 @@ general: repo_doctor: /home/opnfv/repos/doctor repo_copper: /home/opnfv/repos/copper repo_domino: /home/opnfv/repos/domino - repo_snaps: /home/opnfv/repos/snaps repo_fds: /home/opnfv/repos/fds repo_securityscan: /home/opnfv/repos/securityscanning repo_vrouter: /home/opnfv/repos/vnfs/vrouter @@ -56,19 +55,14 @@ snaps: use_keystone: True use_floating_ips: True images: + glance_tests: + disk_file: /home/opnfv/functest/images/cirros-0.3.5-x86_64-disk.img cirros: disk_file: /home/opnfv/functest/images/cirros-0.3.5-x86_64-disk.img - # ARM -# disk_url: http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-disk.img -# kernel_url: http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-kernel -# ramdisk_url: http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-initramfs -# extra_properties: -# os_command_line: root=/dev/vdb1 rw rootwait console=tty0 console=ttyS0 console=ttyAMA0 -# hw_video_model: vga -# ubuntu: -# disk_url: http://uec-images.ubuntu.com/releases/trusty/14.04/ubuntu-14.04-server-cloudimg-amd64-disk1.img -# centos: -# disk_url: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2 + ubuntu: + disk_file: /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.img + centos: + disk_file: /home/opnfv/functest/images/CentOS-7-x86_64-GenericCloud.qcow2 vping: ping_timeout: 200 diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh index f3fdef2e..23e09c10 100755 --- a/functest/ci/download_images.sh +++ b/functest/ci/download_images.sh @@ -28,4 +28,11 @@ wget -nc http://artifacts.opnfv.org/sdnvpn/ubuntu-16.04-server-cloudimg-amd64-di 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} + +# Add Ubuntu 14 qcow2 image +wget -nc http://uec-images.ubuntu.com/releases/trusty/14.04/ubuntu-14.04-server-cloudimg-amd64-disk1.img -P ${IMAGES_FOLDER_DIR} + +# Add Centos 7 qcow2 image +wget -nc http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2 -P ${IMAGES_FOLDER_DIR} + set +ex
\ No newline at end of file |