Updated Branches: refs/heads/two-dot-o 53e2ade8e -> 2c6e7e486 refs/pull/18/merge [deleted] 2709c964e
adding chop integration for distributed performance stress tests Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/879cd314 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/879cd314 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/879cd314 Branch: refs/heads/two-dot-o Commit: 879cd3149bd2b987ebe4ac828ad1e5be3304da4a Parents: 6671849 Author: Alex Karasulu <[email protected]> Authored: Wed Jan 8 17:56:24 2014 +0200 Committer: Alex Karasulu <[email protected]> Committed: Wed Jan 8 17:56:24 2014 +0200 ---------------------------------------------------------------------- stack/corepersistence/collection/pom.xml | 46 +++++++++++++++++++- .../collection/cassandra/CassandraRule.java | 4 +- ...MvccEntitySerializationStrategyImplTest.java | 2 + 3 files changed, 49 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/879cd314/stack/corepersistence/collection/pom.xml ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/pom.xml b/stack/corepersistence/collection/pom.xml index 1a64919..d061204 100644 --- a/stack/corepersistence/collection/pom.xml +++ b/stack/corepersistence/collection/pom.xml @@ -12,9 +12,10 @@ <properties> <guice.version>3.0</guice.version> - <guicyfig.version>3.2-SNAPSHOT</guicyfig.version> + <guicyfig.version>3.2</guicyfig.version> <slf4j.version>1.7.2</slf4j.version> <log4j.version>1.2.17</log4j.version> + <chop.version>1.0-SNAPSHOT</chop.version> </properties> <artifactId>collection</artifactId> @@ -53,6 +54,43 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.safehaus.chop</groupId> + <artifactId>chop-maven-plugin</artifactId> + <version>1.0-SNAPSHOT</version> + + <!-- + NOTE: you should be putting most of these variables into your settings.xml + as an automatically activated profile. + --> + + <configuration> + <accessKey>${aws.s3.key}</accessKey> + <secretKey>${aws.s3.secret}</secretKey> + <bucketName>${aws.s3.bucket}</bucketName> + <managerAppUsername>admin</managerAppUsername> + <managerAppPassword>${manager.app.password}</managerAppPassword> + <testPackageBase>org.safehaus.chop.example</testPackageBase> + <runnerSSHKeyFile>${runner.ssh.key.file}</runnerSSHKeyFile> + <failIfCommitNecessary>false</failIfCommitNecessary> + <amiID>${ami.id}</amiID> + <awsSecurityGroup>${security.group}</awsSecurityGroup> + <runnerKeyPairName>${runner.keypair.name}</runnerKeyPairName> + <minimumRunners>5</minimumRunners> + <maximumRunners>8</maximumRunners> + <securityGroupExceptions> + <!-- + Add your own IP address as an exception to allow access + but please do this in the settings.xml file .. essentially + all parameters should be in the settings.xml file. + --> + <param>${myip.address}/32:8080</param> + <param>${myip.address}/32:22</param> + </securityGroupExceptions> + </configuration> + </plugin> + </plugins> </build> @@ -96,6 +134,12 @@ </dependency> <dependency> + <groupId>org.safehaus.chop</groupId> + <artifactId>chop-api</artifactId> + <version>${chop.version}</version> + </dependency> + + <dependency> <groupId>org.jukito</groupId> <artifactId>jukito</artifactId> <version>${jukito.version}</version> http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/879cd314/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/cassandra/CassandraRule.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/cassandra/CassandraRule.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/cassandra/CassandraRule.java index 62b0ad0..bd37c1f 100644 --- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/cassandra/CassandraRule.java +++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/cassandra/CassandraRule.java @@ -4,7 +4,7 @@ package org.apache.usergrid.persistence.collection.cassandra; import java.io.File; import java.io.IOException; -import org.junit.rules.ExternalResource; +import org.safehaus.guicyfig.EnvironResource; import org.safehaus.guicyfig.GuicyFigModule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,7 +22,7 @@ import com.netflix.astyanax.test.EmbeddedCassandra; * @TODO - I wanted this in the test module but unfortunately that will create a circular dep * due to the inclusion of the MigrationManager */ -public class CassandraRule extends ExternalResource { +public class CassandraRule extends EnvironResource { private static final Logger LOG = LoggerFactory.getLogger( CassandraRule.class ); public static final int THRIFT_PORT = AvailablePortFinder.getNextAvailable(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/879cd314/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java index 23a2d8f..061023e 100644 --- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java +++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java @@ -14,6 +14,7 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; +import org.safehaus.chop.api.IterationChop; import org.safehaus.guicyfig.Env; import org.safehaus.guicyfig.Option; import org.safehaus.guicyfig.Overrides; @@ -57,6 +58,7 @@ import static org.mockito.Mockito.mock; /** @author tnine */ +@IterationChop( iterations = 1000, runners = 6, threads = 9 ) @RunWith( JukitoRunner.class ) @UseModules( CollectionModule.class ) public class MvccEntitySerializationStrategyImplTest {
