Author: asavu
Date: Wed Nov 9 03:59:02 2011
New Revision: 1199607
URL: http://svn.apache.org/viewvc?rev=1199607&view=rev
Log:
WHIRR-426. Create a convention for naming clusters used for integration tests
(asavu)
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/services/cassandra/src/test/resources/whirr-cassandra-test.properties
whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-test.properties
whirr/trunk/services/cdh/src/test/resources/whirr-hbase-test.properties
whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-test.properties
whirr/trunk/services/chef/src/test/resources/whirr-chef-test.properties
whirr/trunk/services/elasticsearch/src/test/resources/whirr-elasticsearch-test.properties
whirr/trunk/services/ganglia/src/test/resources/whirr-ganglia-test.properties
whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test-separate.properties
whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test-single.properties
whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test.properties
whirr/trunk/services/hama/src/test/resources/whirr-hama-test.properties
whirr/trunk/services/hbase/src/test/resources/whirr-hbase-0.90-singlenode-test.properties
whirr/trunk/services/hbase/src/test/resources/whirr-hbase-0.90-test.properties
whirr/trunk/services/hbase/src/test/resources/whirr-hbase-test.properties
whirr/trunk/services/puppet/src/test/resources/whirr-puppet-test.properties
whirr/trunk/services/voldemort/src/test/resources/whirr-voldemort-test.properties
whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties
Modified: whirr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Wed Nov 9 03:59:02 2011
@@ -69,6 +69,9 @@ Trunk (unreleased changes)
WHIRR-419. Display how to connect to remote machines (David Alves via
asavu)
+ WHIRR-426. Create a convention for naming clusters used for integration
+ tests (asavu)
+
BUG FIXES
WHIRR-377. Fix broken CLI logging config. (asavu via tomwhite)
Modified:
whirr/trunk/services/cassandra/src/test/resources/whirr-cassandra-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/cassandra/src/test/resources/whirr-cassandra-test.properties?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
---
whirr/trunk/services/cassandra/src/test/resources/whirr-cassandra-test.properties
(original)
+++
whirr/trunk/services/cassandra/src/test/resources/whirr-cassandra-test.properties
Wed Nov 9 03:59:02 2011
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.cluster-name=cassandraclustertest
+whirr.cluster-name=cassandra-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=2 cassandra
whirr.provider=${sys:whirr.test.provider}
Modified:
whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-test.properties?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
--- whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-test.properties
(original)
+++ whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-test.properties
Wed Nov 9 03:59:02 2011
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.cluster-name=hadoopcdhclustertest
+whirr.cluster-name=hadoop-cdh-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=1 hadoop-jobtracker+hadoop-namenode,1
hadoop-datanode+hadoop-tasktracker
Modified:
whirr/trunk/services/cdh/src/test/resources/whirr-hbase-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/cdh/src/test/resources/whirr-hbase-test.properties?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
--- whirr/trunk/services/cdh/src/test/resources/whirr-hbase-test.properties
(original)
+++ whirr/trunk/services/cdh/src/test/resources/whirr-hbase-test.properties Wed
Nov 9 03:59:02 2011
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.cluster-name=hbasecdhclustertest
+whirr.cluster-name=hbase-cdh-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=1
hadoop-namenode+hadoop-jobtracker+zookeeper+hbase-master+hbase-thriftserver,1
hadoop-datanode+hadoop-tasktracker+hbase-regionserver
Modified:
whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-test.properties?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
--- whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-test.properties
(original)
+++ whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-test.properties
Wed Nov 9 03:59:02 2011
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.cluster-name=zkcdhclustertest
+whirr.cluster-name=zookeeper-cdh-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=2 zookeeper
whirr.provider=${sys:whirr.test.provider}
Modified:
whirr/trunk/services/chef/src/test/resources/whirr-chef-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/chef/src/test/resources/whirr-chef-test.properties?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
--- whirr/trunk/services/chef/src/test/resources/whirr-chef-test.properties
(original)
+++ whirr/trunk/services/chef/src/test/resources/whirr-chef-test.properties Wed
Nov 9 03:59:02 2011
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.cluster-name=chefclustertest
+whirr.cluster-name=chef-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=1 chef:ant+test-service
whirr.firewall-rules=80
Modified:
whirr/trunk/services/elasticsearch/src/test/resources/whirr-elasticsearch-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/elasticsearch/src/test/resources/whirr-elasticsearch-test.properties?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
---
whirr/trunk/services/elasticsearch/src/test/resources/whirr-elasticsearch-test.properties
(original)
+++
whirr/trunk/services/elasticsearch/src/test/resources/whirr-elasticsearch-test.properties
Wed Nov 9 03:59:02 2011
@@ -15,8 +15,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.cluster-name=elasticsearchtest
+whirr.cluster-name=elasticsearch-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=2 elasticsearch
+
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
Modified:
whirr/trunk/services/ganglia/src/test/resources/whirr-ganglia-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/ganglia/src/test/resources/whirr-ganglia-test.properties?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
---
whirr/trunk/services/ganglia/src/test/resources/whirr-ganglia-test.properties
(original)
+++
whirr/trunk/services/ganglia/src/test/resources/whirr-ganglia-test.properties
Wed Nov 9 03:59:02 2011
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.cluster-name=gangliaclustertest
+whirr.cluster-name=ganglia-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=1 ganglia-metad, 1 ganglia-monitor
whirr.provider=${sys:whirr.test.provider}
Modified:
whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test-separate.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test-separate.properties?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
---
whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test-separate.properties
(original)
+++
whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test-separate.properties
Wed Nov 9 03:59:02 2011
@@ -15,8 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.cluster-name=hadoopclustertest-separate
+whirr.cluster-name=hadoop-separate-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=1 hadoop-jobtracker,1 hadoop-namenode,1
hadoop-datanode,1 hadoop-tasktracker
+
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
+
Modified:
whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test-single.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test-single.properties?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
---
whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test-single.properties
(original)
+++
whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test-single.properties
Wed Nov 9 03:59:02 2011
@@ -15,8 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.cluster-name=hadoopclustertest-single
+whirr.cluster-name=hadoop-single-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=1
hadoop-jobtracker+hadoop-namenode+hadoop-datanode+hadoop-tasktracker
+
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
+
Modified:
whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test.properties?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
--- whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test.properties
(original)
+++ whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test.properties
Wed Nov 9 03:59:02 2011
@@ -15,8 +15,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.cluster-name=hadoopclustertest
+whirr.cluster-name=hadoop-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=1 hadoop-jobtracker+hadoop-namenode,1
hadoop-datanode+hadoop-tasktracker
+
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
Modified:
whirr/trunk/services/hama/src/test/resources/whirr-hama-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/hama/src/test/resources/whirr-hama-test.properties?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
--- whirr/trunk/services/hama/src/test/resources/whirr-hama-test.properties
(original)
+++ whirr/trunk/services/hama/src/test/resources/whirr-hama-test.properties Wed
Nov 9 03:59:02 2011
@@ -15,10 +15,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.cluster-name=hamaclustertest
+whirr.cluster-name=hama-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=1 zookeeper,1
hadoop-namenode+hadoop-jobtracker+hama-master,1
hadoop-datanode+hadoop-tasktracker+hama-groomserver
+
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
+
whirr.hama.tarball.url=http://archive.apache.org/dist/incubator/hama/0.3-incubating/hama-0.3.0-incubating.tar.gz
Modified:
whirr/trunk/services/hbase/src/test/resources/whirr-hbase-0.90-singlenode-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/hbase/src/test/resources/whirr-hbase-0.90-singlenode-test.properties?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
---
whirr/trunk/services/hbase/src/test/resources/whirr-hbase-0.90-singlenode-test.properties
(original)
+++
whirr/trunk/services/hbase/src/test/resources/whirr-hbase-0.90-singlenode-test.properties
Wed Nov 9 03:59:02 2011
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.cluster-name=hbaseclustertest
+whirr.cluster-name=hbase-0-90-single-node-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=1
hadoop-namenode+hadoop-jobtracker+zookeeper+hbase-master+hbase-thriftserver+hadoop-datanode+hadoop-tasktracker+hbase-regionserver
whirr.provider=${sys:whirr.test.provider}
Modified:
whirr/trunk/services/hbase/src/test/resources/whirr-hbase-0.90-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/hbase/src/test/resources/whirr-hbase-0.90-test.properties?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
---
whirr/trunk/services/hbase/src/test/resources/whirr-hbase-0.90-test.properties
(original)
+++
whirr/trunk/services/hbase/src/test/resources/whirr-hbase-0.90-test.properties
Wed Nov 9 03:59:02 2011
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.cluster-name=hbaseclustertest
+whirr.cluster-name=hbase-0-90-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=1
hadoop-namenode+hadoop-jobtracker+zookeeper+hbase-master+hbase-thriftserver,1
hadoop-datanode+hadoop-tasktracker+hbase-regionserver
whirr.provider=${sys:whirr.test.provider}
Modified:
whirr/trunk/services/hbase/src/test/resources/whirr-hbase-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/hbase/src/test/resources/whirr-hbase-test.properties?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
--- whirr/trunk/services/hbase/src/test/resources/whirr-hbase-test.properties
(original)
+++ whirr/trunk/services/hbase/src/test/resources/whirr-hbase-test.properties
Wed Nov 9 03:59:02 2011
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.cluster-name=hbaseclustertest
+whirr.cluster-name=hbase-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=1
hadoop-namenode+hadoop-jobtracker+zookeeper+hbase-master+hbase-thriftserver,1
hadoop-datanode+hadoop-tasktracker+hbase-regionserver
whirr.provider=${sys:whirr.test.provider}
Modified:
whirr/trunk/services/puppet/src/test/resources/whirr-puppet-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/puppet/src/test/resources/whirr-puppet-test.properties?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
--- whirr/trunk/services/puppet/src/test/resources/whirr-puppet-test.properties
(original)
+++ whirr/trunk/services/puppet/src/test/resources/whirr-puppet-test.properties
Wed Nov 9 03:59:02 2011
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.cluster-name=puppettest
+whirr.cluster-name=puppet-itest-${sys:whirr.test.provider}-${sys:user.name}
# Change the number of machines in the cluster here
whirr.instance-templates=1 puppet:apache+puppet:ntp
Modified:
whirr/trunk/services/voldemort/src/test/resources/whirr-voldemort-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/voldemort/src/test/resources/whirr-voldemort-test.properties?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
---
whirr/trunk/services/voldemort/src/test/resources/whirr-voldemort-test.properties
(original)
+++
whirr/trunk/services/voldemort/src/test/resources/whirr-voldemort-test.properties
Wed Nov 9 03:59:02 2011
@@ -15,8 +15,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.cluster-name=voldemort
+whirr.cluster-name=voldemort-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=2 voldemort
+
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
Modified:
whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties?rev=1199607&r1=1199606&r2=1199607&view=diff
==============================================================================
---
whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties
(original)
+++
whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties
Wed Nov 9 03:59:02 2011
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.cluster-name=zkclustertest
+whirr.cluster-name=zookeeper-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=2 zookeeper
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
