honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12615 from rmuir/test_load_balancing 

Give unit tests and integ tests separate load balancing
This commit is contained in:
Robert Muir 2015-08-03 18:56:04 -04:00
parent d349deb9b7 d67d7b0fb0
commit 3867e43196
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pom.xml
View File

@ -70,6 +70,7 @@
<tests.heapdump.path>${basedir}/logs/</tests.heapdump.path> <tests.heapdump.path>${basedir}/logs/</tests.heapdump.path>
<tests.topn>5</tests.topn> <tests.topn>5</tests.topn>
<execution.hint.file>.local-${elasticsearch.version}-execution-hints.log</execution.hint.file> <execution.hint.file>.local-${elasticsearch.version}-execution-hints.log</execution.hint.file>
<execution.hint.integ.file>.local-${elasticsearch.version}-integ-execution-hints.log</execution.hint.integ.file>
<tests.assertion.disabled>false</tests.assertion.disabled> <tests.assertion.disabled>false</tests.assertion.disabled>
<tests.verbose>false</tests.verbose> <tests.verbose>false</tests.verbose>
<tests.seed></tests.seed> <tests.seed></tests.seed>
@ -597,11 +598,6 @@
<disable package="${tests.assertion.disabled}"/> <disable package="${tests.assertion.disabled}"/>
<!-- pass org.elasticsearch to run without assertions --> <!-- pass org.elasticsearch to run without assertions -->
</assertions> </assertions>
<balancers>
<execution-times>
<fileset dir="${basedir}" includes="${execution.hint.file}"/>
</execution-times>
</balancers>
<jvmArgs> <jvmArgs>
<param>-Xmx${tests.heap.size}</param> <param>-Xmx${tests.heap.size}</param>
<param>-Xms${tests.heap.size}</param> <param>-Xms${tests.heap.size}</param>
@ -690,7 +686,6 @@
<containsregex pattern="^(\s+at )(org\.apache\.lucene.util\.AbstractBeforeAfterRule)" /> <containsregex pattern="^(\s+at )(org\.apache\.lucene.util\.AbstractBeforeAfterRule)" />
</filtertrace> </filtertrace>
</report-text> </report-text>
<report-execution-times historyLength="20" file="${basedir}/${execution.hint.file}"/>
</listeners> </listeners>
</configuration> </configuration>
<executions> <executions>
@ -706,7 +701,14 @@
<listeners> <listeners>
<report-ant-xml mavenExtensions="true" <report-ant-xml mavenExtensions="true"
dir="${project.build.directory}/surefire-reports"/> dir="${project.build.directory}/surefire-reports"/>
<report-execution-times historyLength="20"
file="${basedir}/${execution.hint.file}"/>
</listeners> </listeners>
<balancers>
<execution-times>
<fileset dir="${basedir}" includes="${execution.hint.file}"/>
</execution-times>
</balancers>
<includes> <includes>
<include>**/*Tests.class</include> <include>**/*Tests.class</include>
<include>**/*Test.class</include> <include>**/*Test.class</include>
@ -732,7 +734,14 @@
mavenExtensions="true" mavenExtensions="true"
summaryFile="${project.build.directory}/failsafe-reports/failsafe-summary.xml" summaryFile="${project.build.directory}/failsafe-reports/failsafe-summary.xml"
dir="${project.build.directory}/failsafe-reports"/> dir="${project.build.directory}/failsafe-reports"/>
<report-execution-times historyLength="20"
file="${basedir}/${execution.hint.integ.file}"/>
</listeners> </listeners>
<balancers>
<execution-times>
<fileset dir="${basedir}" includes="${execution.hint.integ.file}"/>
</execution-times>
</balancers>
<includes> <includes>
<include>**/*IT.class</include> <include>**/*IT.class</include>
</includes> </includes>
@ -1177,6 +1186,22 @@ org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UT
<goal>run</goal> <goal>run</goal>
</goals> </goals>
</execution> </execution>
<execution>
<id>integ-tests-top-hints</id>
<phase>integration-test</phase>
<configuration>
<skip>${skip.integ.tests}</skip>
<target>
<taskdef resource="com/carrotsearch/junit4/antlib.xml" classpathref="maven.plugin.classpath"/>
<tophints max="${tests.topn}">
<fileset dir="${basedir}" includes="${execution.hint.integ.file}"/>
</tophints>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions> </executions>
<dependencies> <dependencies>
<dependency> <dependency>