From 5107472a01eaadc8b7afdeee6085240379c19605 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 13 Nov 2014 17:47:30 +0530 Subject: [PATCH 1/3] CLOUDSTACK-6892: use lowercase noredist, as package.sh lowercases build type Signed-off-by: Rohit Yadav (cherry picked from commit a18d067278f6b58914dc6a5d44b775ada6cf073e) Signed-off-by: Rohit Yadav --- packaging/centos63/cloud.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index e977e34eb0b..072a0b94884 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -181,7 +181,7 @@ Group: System Environment/Libraries %description awsapi Apache Cloudstack AWS API compatibility wrapper -%if "%{_ossnoss}" == "NOREDIST" +%if "%{_ossnoss}" == "noredist" %package mysql-ha Summary: Apache CloudStack Balancing Strategy for MySQL Requires: mysql-connector-java @@ -377,7 +377,7 @@ for name in cloud-bridge.properties commons-logging.properties ec2-service.prope done # MYSQL HA -if [ "x%{_ossnoss}" == "xNOREDIST" ] ; then +if [ "x%{_ossnoss}" == "xnoredist" ] ; then mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib cp -r plugins/database/mysql-ha/target/cloud-plugin-database-mysqlha-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib fi @@ -404,7 +404,7 @@ install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsap install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE -if [ "x%{_ossnoss}" == "xNOREDIST" ] ; then +if [ "x%{_ossnoss}" == "xnoredist" ] ; then install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/LICENSE install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/NOTICE fi @@ -697,7 +697,7 @@ fi %{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE %{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE -%if "%{_ossnoss}" == "NOREDIST" +%if "%{_ossnoss}" == "noredist" %files mysql-ha %defattr(0644,cloud,cloud,0755) %attr(0644,root,root) %{_datadir}/%{name}-mysql-ha/lib/* From a02864ab8b21de5b29060671a06afd004bc69af1 Mon Sep 17 00:00:00 2001 From: Chandan Purushothama Date: Wed, 12 Nov 2014 18:43:49 -0800 Subject: [PATCH 2/3] CLOUDSTACK-7897 : Fixed the script test_reset_ssh_keypair.py - Test Cases failing on Simulator as Testcases try to ssh to the VMs Signed-off-by: SrikanteswaraRao Talluri --- test/integration/component/test_reset_ssh_keypair.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/component/test_reset_ssh_keypair.py b/test/integration/component/test_reset_ssh_keypair.py index 20321acd8d2..370e9a8dfa6 100644 --- a/test/integration/component/test_reset_ssh_keypair.py +++ b/test/integration/component/test_reset_ssh_keypair.py @@ -1065,7 +1065,7 @@ class TestResetSSHKeyUserRights(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return - @attr(tags=["simulator", "basic", "advanced"]) + @attr(tags=["basic", "advanced"], required_hardware="true") def test_01_reset_keypair_normal_user(self): """Verify API resetSSHKeyForVirtualMachine for non admin non root domain user""" @@ -1183,7 +1183,7 @@ class TestResetSSHKeyUserRights(cloudstackTestCase): virtual_machine.delete(self.apiclient, expunge=True) return - @attr(tags=["simulator", "basic", "advanced"]) + @attr(tags=["basic", "advanced"], required_hardware="true") def test_02_reset_keypair_domain_admin(self): """Verify API resetSSHKeyForVirtualMachine for domain admin non root domain user""" @@ -1322,7 +1322,7 @@ class TestResetSSHKeyUserRights(cloudstackTestCase): virtual_machine.delete(self.apiclient, expunge=True) return - @attr(tags=["simulator", "basic", "advanced"]) + @attr(tags=["basic", "advanced"], required_hardware="true") def test_03_reset_keypair_root_admin(self): """Verify API resetSSHKeyForVirtualMachine for domain admin root domain user""" From bcf328833a84f1d490a774edb63af3e301cf0f5a Mon Sep 17 00:00:00 2001 From: Chandan Purushothama Date: Wed, 12 Nov 2014 18:37:35 -0800 Subject: [PATCH 3/3] CLOUDSTACK-7895 : Fixed the script test_security_groups.py - Test Cases failing on Simulator as Testcases try to ssh to the VMs Signed-off-by: SrikanteswaraRao Talluri --- test/integration/component/test_security_groups.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py index ba276935791..89317f43736 100644 --- a/test/integration/component/test_security_groups.py +++ b/test/integration/component/test_security_groups.py @@ -749,7 +749,7 @@ class TestDhcpOnlyRouter(cloudstackTestCase): return - @attr(tags = ["sg", "eip", "basic"]) + @attr(tags = ["sg", "eip", "basic"], required_hardware="true") def test_01_dhcpOnlyRouter(self): """Test router services for user account """