From 94281f952d910b789c09028490479ea544afcf88 Mon Sep 17 00:00:00 2001 From: shweta agarwal Date: Thu, 4 Feb 2016 16:57:08 +0530 Subject: [PATCH] added suggested changes to coreos automation --- test/integration/component/test_coreos.py | 5 +++-- tools/marvin/marvin/config/test_data.py | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/integration/component/test_coreos.py b/test/integration/component/test_coreos.py index ad1c1ab6b78..a56d7c259b3 100644 --- a/test/integration/component/test_coreos.py +++ b/test/integration/component/test_coreos.py @@ -114,7 +114,7 @@ class TestDeployVmWithCoreosTemplate(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return - @attr(tags=["advanced"], required_hardware="true") + @attr(tags=["advanced","tt"], required_hardware="true") def test1_coreos_VM_creation(self): self.hypervisor = str(get_hypervisor_type(self.api_client)).lower() @@ -226,7 +226,7 @@ class TestDeployVmWithCoreosTemplate(cloudstackTestCase): ) else: list_router_response = list_routers( - self.api_Client, + self.api_client, account=self.account.name, domainid=self.account.domainid ) @@ -287,5 +287,6 @@ class TestDeployVmWithCoreosTemplate(cloudstackTestCase): res.__contains__("name: docker.service"), True, "Userdata Not applied Check the failures") + self.account.delete(self.api_client) return diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py index 0a7c4d218b4..08dc91853c7 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -789,8 +789,7 @@ test_data = { "name": "coreos", "passwordenabled": False, "ostype": "Coreos", - "urlvmware":"http://dl.openvm.eu/cloudstack/coreos/x86_64/" \ - "coreos_production_cloudstack_image-vmware.vmdk.bz2", + "urlvmware":"http://10.147.28.7/templates/coreos/coreos_production_vmware.ova", "urlxen":"http://dl.openvm.eu/cloudstack/coreos/x86_64/" "coreos_production_cloudstack_image-xen.vhd.bz2", "urlkvm": "http://dl.openvm.eu/cloudstack/coreos/x86_64/" \