Author: asavu
Date: Wed Oct 19 17:05:04 2011
New Revision: 1186342
URL: http://svn.apache.org/viewvc?rev=1186342&view=rev
Log:
WHIRR-401. Use regular instances for testing on aws-ec2 (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/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.properties
whirr/trunk/services/hama/src/test/resources/whirr-hama-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=1186342&r1=1186341&r2=1186342&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Wed Oct 19 17:05:04 2011
@@ -40,6 +40,8 @@ Trunk (unreleased changes)
WHIRR-243. Allow to run component tests in memory
(David Alves, Adrian Cole via asavu)
+ WHIRR-401. Use regular instances for testing on aws-ec2 (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=1186342&r1=1186341&r2=1186342&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 Oct 19 17:05:04 2011
@@ -21,4 +21,3 @@ whirr.provider=${sys:whirr.test.provider
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
whirr.hardware-min-ram=512
-whirr.aws-ec2-spot-price=0.02
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=1186342&r1=1186341&r2=1186342&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 Oct 19 17:05:04 2011
@@ -26,4 +26,3 @@ whirr.credential=${sys:whirr.test.creden
whirr.hadoop.install-function=install_cdh_hadoop
whirr.hadoop.configure-function=configure_cdh_hadoop
-whirr.aws-ec2-spot-price=0.34
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=1186342&r1=1186341&r2=1186342&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
Oct 19 17:05:04 2011
@@ -32,4 +32,3 @@ whirr.hbase.configure-function=configure
whirr.zookeeper.install-function=install_cdh_zookeeper
whirr.zookeeper.configure-function=configure_cdh_zookeeper
-whirr.aws-ec2-spot-price=0.34
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=1186342&r1=1186341&r2=1186342&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 Oct 19 17:05:04 2011
@@ -26,5 +26,4 @@ whirr.zookeeper.install-function=install
whirr.zookeeper.configure-function=configure_cdh_zookeeper
whirr.hardware-min-ram=512
-whirr.aws-ec2-spot-price=0.02
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=1186342&r1=1186341&r2=1186342&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 Oct 19 17:05:04 2011
@@ -21,4 +21,3 @@ whirr.provider=${sys:whirr.test.provider
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
whirr.hardware-min-ram=512
-whirr.aws-ec2-spot-price=0.02
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=1186342&r1=1186341&r2=1186342&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 Oct 19 17:05:04 2011
@@ -21,4 +21,3 @@ whirr.provider=${sys:whirr.test.provider
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
whirr.hardware-min-ram=512
-whirr.aws-ec2-spot-price=0.02
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=1186342&r1=1186341&r2=1186342&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 Oct 19 17:05:04 2011
@@ -20,4 +20,3 @@ whirr.instance-templates=1 hadoop-jobtra
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
-whirr.aws-ec2-spot-price=0.34
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=1186342&r1=1186341&r2=1186342&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
Oct 19 17:05:04 2011
@@ -21,5 +21,4 @@ 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
-whirr.aws-ec2-spot-price=0.34
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=1186342&r1=1186341&r2=1186342&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 Oct 19 17:05:04 2011
@@ -25,5 +25,4 @@ whirr.credential=${sys:whirr.test.creden
whirr.hbase.tarball.url=http://apache.cu.be/hbase/hbase-0.90.3/hbase-0.90.3.tar.gz
whirr.hadoop.tarball.url=http://archive.cloudera.com/cdh/3/hadoop-0.20.2-cdh3u0.tar.gz
-whirr.aws-ec2-spot-price=0.34
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=1186342&r1=1186341&r2=1186342&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 Oct 19 17:05:04 2011
@@ -24,5 +24,4 @@ whirr.credential=${sys:whirr.test.creden
whirr.hbase.tarball.url=http://archive.apache.org/dist/hbase/hbase-0.89.20100924/hbase-0.89.20100924-bin.tar.gz
-whirr.aws-ec2-spot-price=0.34
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=1186342&r1=1186341&r2=1186342&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 Oct 19 17:05:04 2011
@@ -33,5 +33,4 @@ whirr.provider=${sys:whirr.test.provider
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
-whirr.aws-ec2-spot-price=0.34
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=1186342&r1=1186341&r2=1186342&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 Oct 19 17:05:04 2011
@@ -20,4 +20,3 @@ whirr.instance-templates=2 voldemort
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
-whirr.aws-ec2-spot-price=0.34
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=1186342&r1=1186341&r2=1186342&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 Oct 19 17:05:04 2011
@@ -21,5 +21,4 @@ whirr.provider=${sys:whirr.test.provider
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
whirr.hardware-min-ram=512
-whirr.aws-ec2-spot-price=0.02
