diff options
| -rw-r--r-- | docs/testing/user/configguide/configguide.rst | 1 | ||||
| -rw-r--r-- | functest/ci/download_images.sh | 1 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/cloudify_ims.yaml | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/cloudify_ims_perf.yaml | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/orchestra.yaml | 4 |
5 files changed, 4 insertions, 6 deletions
diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst index f65810817..ef40bf598 100644 --- a/docs/testing/user/configguide/configguide.rst +++ b/docs/testing/user/configguide/configguide.rst @@ -72,7 +72,6 @@ Create a directory for the different images (attached as a Docker volume):: images/cirros-d161201-aarch64-kernel images/cloudify-manager-premium-4.0.1.qcow2 images/img - images/trusty-server-cloudimg-amd64-disk1.img images/ubuntu-14.04-server-cloudimg-amd64-disk1.img images/ubuntu-14.04-server-cloudimg-arm64-uefi1.img images/ubuntu-16.04-server-cloudimg-amd64-disk1.img diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh index 14cda1470..8013bc281 100644 --- a/functest/ci/download_images.sh +++ b/functest/ci/download_images.sh @@ -10,7 +10,6 @@ https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloud 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://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-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 diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml b/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml index e1a7bf316..4586dfd33 100644 --- a/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml +++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml @@ -1,7 +1,7 @@ --- tenant_images: ubuntu_14.04: - /home/opnfv/functest/images/trusty-server-cloudimg-amd64-disk1.img + /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.img cloudify_manager_4.0: /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.qcow2 orchestrator: diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.yaml b/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.yaml index 77b295d0a..7573e079f 100644 --- a/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.yaml +++ b/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.yaml @@ -1,7 +1,7 @@ --- tenant_images: ubuntu_14.04: - http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img + http://cloud-images.ubuntu.com/trusty/current/ubuntu-14.04-server-cloudimg-amd64-disk1.img cloudify_manager_4.0: http://repository.cloudifysource.org/cloudify/4.0.1/sp-release/cloudify-manager-premium-4.0.1.qcow2 # PATH of the virtual chassis image. diff --git a/functest/opnfv_tests/vnf/ims/orchestra.yaml b/functest/opnfv_tests/vnf/ims/orchestra.yaml index f81f55fbe..905dcd800 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra.yaml +++ b/functest/opnfv_tests/vnf/ims/orchestra.yaml @@ -2,12 +2,12 @@ tenant_images: orchestrator: ubuntu-14.04-server-cloudimg-amd64-disk1: - /home/opnfv/functest/images/trusty-server-cloudimg-amd64-disk1.img + /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.img orchestra_openims: openims: /home/opnfv/functest/images/img orchestra_clearwaterims: ubuntu-14.04-server-cloudimg-amd64-disk1: - /home/opnfv/functest/images/trusty-server-cloudimg-amd64-disk1.img + /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.img mano: name: OpenBaton version: '3.2.0' |