You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ta...@apache.org on 2014/11/13 13:30:03 UTC
[1/4] git commit: updated refs/heads/master to fa4cc85
Repository: cloudstack
Updated Branches:
refs/heads/master 765443e7d -> fa4cc856a
CLOUDSTACK-6892: use lowercase noredist, as package.sh lowercases build type
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit a18d067278f6b58914dc6a5d44b775ada6cf073e)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5107472a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5107472a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5107472a
Branch: refs/heads/master
Commit: 5107472a01eaadc8b7afdeee6085240379c19605
Parents: d2c087a
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Nov 13 17:47:30 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Nov 13 17:48:56 2014 +0530
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5107472a/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index e977e34..072a0b9 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/*
[4/4] git commit: updated refs/heads/master to fa4cc85
Posted by ta...@apache.org.
bringing in bcf328833a84f1d490a774edb63af3e301cf0f5a from 4.5
Merge branch '4.5'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fa4cc856
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fa4cc856
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fa4cc856
Branch: refs/heads/master
Commit: fa4cc856aa6b595cc373c5564609b6d2ae22a60f
Parents: 765443e bcf3288
Author: SrikanteswaraRao Talluri <ta...@apache.org>
Authored: Thu Nov 13 17:58:56 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Thu Nov 13 17:58:56 2014 +0530
----------------------------------------------------------------------
test/integration/component/test_security_groups.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/4] git commit: updated refs/heads/master to fa4cc85
Posted by ta...@apache.org.
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 <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a02864ab
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a02864ab
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a02864ab
Branch: refs/heads/master
Commit: a02864ab8b21de5b29060671a06afd004bc69af1
Parents: 5107472
Author: Chandan Purushothama <Ch...@citrix.com>
Authored: Wed Nov 12 18:43:49 2014 -0800
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Thu Nov 13 17:50:14 2014 +0530
----------------------------------------------------------------------
test/integration/component/test_reset_ssh_keypair.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a02864ab/test/integration/component/test_reset_ssh_keypair.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_reset_ssh_keypair.py b/test/integration/component/test_reset_ssh_keypair.py
index 20321ac..370e9a8 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"""
[3/4] git commit: updated refs/heads/master to fa4cc85
Posted by ta...@apache.org.
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 <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bcf32883
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bcf32883
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bcf32883
Branch: refs/heads/master
Commit: bcf328833a84f1d490a774edb63af3e301cf0f5a
Parents: a02864a
Author: Chandan Purushothama <Ch...@citrix.com>
Authored: Wed Nov 12 18:37:35 2014 -0800
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Thu Nov 13 17:56:20 2014 +0530
----------------------------------------------------------------------
test/integration/component/test_security_groups.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bcf32883/test/integration/component/test_security_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py
index ba27693..89317f4 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
"""