diff options
Diffstat (limited to 'functest')
| -rw-r--r-- | functest/ci/download_images.sh | 10 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/refstack_client/refstack_client.py | 13 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 13 |
3 files changed, 21 insertions, 15 deletions
diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh index cc0abc14..47c8f867 100644 --- a/functest/ci/download_images.sh +++ b/functest/ci/download_images.sh @@ -5,17 +5,17 @@ set -ex 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.3.5/cirros-0.3.5-x86_64-disk.img +http://artifacts.opnfv.org/functest/images/cirros-0.3.5-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://marketplace.openbaton.org:8082/api/v1/images/52e2ccc0-1dce-4663-894d-28aab49323aa/img http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img -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 +http://artifacts.opnfv.org/functest/images/cirros-0.3.5-x86_64-lxc.tar.gz +http://artifacts.opnfv.org/functest/images/cirros-d161201-aarch64-disk.img +http://artifacts.opnfv.org/functest/images/cirros-d161201-aarch64-initramfs +http://artifacts.opnfv.org/functest/images/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 diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py index d4a1f072..17e02466 100644 --- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py +++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py @@ -224,11 +224,14 @@ class RefstackClient(testcase.TestCase): if not self.tempestconf: self.generate_conf() - os_utils.init_tempest_cleanup( - self.tempestconf.DEPLOYMENT_DIR, 'tempest.conf', - os.path.join(conf_utils.REFSTACK_RESULTS_DIR, - "tempest-cleanup-init.log") - ) + try: + os_utils.init_tempest_cleanup( + self.tempestconf.DEPLOYMENT_DIR, 'tempest.conf', + os.path.join(conf_utils.REFSTACK_RESULTS_DIR, + "tempest-cleanup-init.log")) + except Exception as err: + LOGGER.error(str(err)) + return testcase.TestCase.EX_RUN_ERROR return super(RefstackClient, self).create_snapshot() diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 0495b635..b8a4e9ad 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -267,11 +267,14 @@ class TempestCommon(testcase.TestCase): # Make sure that the verifier is configured conf_utils.configure_verifier(self.DEPLOYMENT_DIR) - os_utils.init_tempest_cleanup( - self.DEPLOYMENT_DIR, 'tempest.conf', - os.path.join(conf_utils.TEMPEST_RESULTS_DIR, - "tempest-cleanup-init.log") - ) + try: + os_utils.init_tempest_cleanup( + self.DEPLOYMENT_DIR, 'tempest.conf', + os.path.join(conf_utils.TEMPEST_RESULTS_DIR, + "tempest-cleanup-init.log")) + except Exception as err: + logger.error(str(err)) + return testcase.TestCase.EX_RUN_ERROR return super(TempestCommon, self).create_snapshot() |