etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added suggested changes to coreos automation

This commit is contained in:
shweta agarwal 2016-02-04 16:57:08 +05:30
parent 9535596074
commit 94281f952d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/integration/component/test_coreos.py
View File

@ -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

3
tools/marvin/marvin/config/test_data.py
View File

@ -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/" \