cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sanj...@apache.org
Subject [2/3] git commit: updated refs/heads/master to 56859c9
Date Wed, 10 Feb 2016 05:34:34 GMT
added suggested changes to coreos automation


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/94281f95
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/94281f95
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/94281f95

Branch: refs/heads/master
Commit: 94281f952d910b789c09028490479ea544afcf88
Parents: 9535596
Author: shweta agarwal <shweta.agarwal@citrix.com>
Authored: Thu Feb 4 16:57:08 2016 +0530
Committer: shweta agarwal <shweta.agarwal@citrix.com>
Committed: Thu Feb 4 16:57:08 2016 +0530

----------------------------------------------------------------------
 test/integration/component/test_coreos.py | 5 +++--
 tools/marvin/marvin/config/test_data.py   | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/94281f95/test/integration/component/test_coreos.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_coreos.py b/test/integration/component/test_coreos.py
index ad1c1ab..a56d7c2 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

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/94281f95/tools/marvin/marvin/config/test_data.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index 0a7c4d2..08dc918 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/" \


Mime
View raw message