Backport HADOOP-13514 (surefire upgrade) to branch-2
This commit is contained in:
parent
54803ebe49
commit
762125b864
|
@ -267,10 +267,10 @@ If the build process fails with an out of memory error, you should be able to fi
|
||||||
it by increasing the memory used by maven which can be done via the environment
|
it by increasing the memory used by maven which can be done via the environment
|
||||||
variable MAVEN_OPTS.
|
variable MAVEN_OPTS.
|
||||||
|
|
||||||
Here is an example setting to allocate between 256 and 512 MB of heap space to
|
Here is an example setting to allocate between 256 MB and 1 GB of heap space to
|
||||||
Maven
|
Maven
|
||||||
|
|
||||||
export MAVEN_OPTS="-Xms256m -Xmx512m"
|
export MAVEN_OPTS="-Xms256m -Xmx1g"
|
||||||
|
|
||||||
----------------------------------------------------------------------------------
|
----------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -111,7 +111,7 @@
|
||||||
|
|
||||||
<!-- Plugin versions and config -->
|
<!-- Plugin versions and config -->
|
||||||
<maven-surefire-plugin.argLine>-Xmx2048m -XX:MaxPermSize=768m -XX:+HeapDumpOnOutOfMemoryError</maven-surefire-plugin.argLine>
|
<maven-surefire-plugin.argLine>-Xmx2048m -XX:MaxPermSize=768m -XX:+HeapDumpOnOutOfMemoryError</maven-surefire-plugin.argLine>
|
||||||
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
|
||||||
<maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version>
|
<maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version>
|
||||||
<maven-failsafe-plugin.version>${maven-surefire-plugin.version}</maven-failsafe-plugin.version>
|
<maven-failsafe-plugin.version>${maven-surefire-plugin.version}</maven-failsafe-plugin.version>
|
||||||
|
|
||||||
|
@ -1521,6 +1521,7 @@
|
||||||
<DYLD_LIBRARY_PATH>${env.DYLD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</DYLD_LIBRARY_PATH>
|
<DYLD_LIBRARY_PATH>${env.DYLD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</DYLD_LIBRARY_PATH>
|
||||||
<MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
|
<MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
|
||||||
</environmentVariables>
|
</environmentVariables>
|
||||||
|
<trimStackTrace>false</trimStackTrace>
|
||||||
<systemPropertyVariables>
|
<systemPropertyVariables>
|
||||||
|
|
||||||
<hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
|
<hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
|
||||||
|
@ -1531,7 +1532,7 @@
|
||||||
<test.build.data>${test.build.data}</test.build.data>
|
<test.build.data>${test.build.data}</test.build.data>
|
||||||
<test.build.webapps>${test.build.webapps}</test.build.webapps>
|
<test.build.webapps>${test.build.webapps}</test.build.webapps>
|
||||||
<test.cache.data>${test.cache.data}</test.cache.data>
|
<test.cache.data>${test.cache.data}</test.cache.data>
|
||||||
<test.build.classes>${test.build.classes}</test.build.classes>
|
<test.build.classes>${project.build.directory}/test-classes</test.build.classes>
|
||||||
|
|
||||||
<java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
|
<java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
|
||||||
<java.security.krb5.conf>${project.build.directory}/test-classes/krb5.conf</java.security.krb5.conf>
|
<java.security.krb5.conf>${project.build.directory}/test-classes/krb5.conf</java.security.krb5.conf>
|
||||||
|
|
|
@ -153,6 +153,7 @@
|
||||||
<reuseForks>false</reuseForks>
|
<reuseForks>false</reuseForks>
|
||||||
<argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine>
|
<argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine>
|
||||||
<forkedProcessTimeoutInSeconds>${fs.s3a.scale.test.timeout}</forkedProcessTimeoutInSeconds>
|
<forkedProcessTimeoutInSeconds>${fs.s3a.scale.test.timeout}</forkedProcessTimeoutInSeconds>
|
||||||
|
<trimStackTrace>false</trimStackTrace>
|
||||||
<systemPropertyVariables>
|
<systemPropertyVariables>
|
||||||
<!-- Tell tests that they are being executed in parallel -->
|
<!-- Tell tests that they are being executed in parallel -->
|
||||||
<test.parallel.execution>true</test.parallel.execution>
|
<test.parallel.execution>true</test.parallel.execution>
|
||||||
|
@ -209,6 +210,7 @@
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<forkedProcessTimeoutInSeconds>${fs.s3a.scale.test.timeout}</forkedProcessTimeoutInSeconds>
|
<forkedProcessTimeoutInSeconds>${fs.s3a.scale.test.timeout}</forkedProcessTimeoutInSeconds>
|
||||||
|
<trimStackTrace>false</trimStackTrace>
|
||||||
<systemPropertyVariables>
|
<systemPropertyVariables>
|
||||||
<!-- Tell tests that they are being executed sequentially -->
|
<!-- Tell tests that they are being executed sequentially -->
|
||||||
<test.parallel.execution>false</test.parallel.execution>
|
<test.parallel.execution>false</test.parallel.execution>
|
||||||
|
|
|
@ -326,6 +326,7 @@
|
||||||
<reuseForks>false</reuseForks>
|
<reuseForks>false</reuseForks>
|
||||||
<argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine>
|
<argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine>
|
||||||
<forkedProcessTimeoutInSeconds>${fs.azure.scale.test.timeout}</forkedProcessTimeoutInSeconds>
|
<forkedProcessTimeoutInSeconds>${fs.azure.scale.test.timeout}</forkedProcessTimeoutInSeconds>
|
||||||
|
<trimStackTrace>false</trimStackTrace>
|
||||||
<systemPropertyVariables>
|
<systemPropertyVariables>
|
||||||
<!-- Tell tests that they are being executed in parallel -->
|
<!-- Tell tests that they are being executed in parallel -->
|
||||||
<test.parallel.execution>true</test.parallel.execution>
|
<test.parallel.execution>true</test.parallel.execution>
|
||||||
|
@ -381,6 +382,7 @@
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<forkedProcessTimeoutInSeconds>${fs.azure.scale.test.timeout}</forkedProcessTimeoutInSeconds>
|
<forkedProcessTimeoutInSeconds>${fs.azure.scale.test.timeout}</forkedProcessTimeoutInSeconds>
|
||||||
|
<trimStackTrace>false</trimStackTrace>
|
||||||
<systemPropertyVariables>
|
<systemPropertyVariables>
|
||||||
<test.parallel.execution>false</test.parallel.execution>
|
<test.parallel.execution>false</test.parallel.execution>
|
||||||
<fs.azure.scale.test.enabled>${fs.azure.scale.test.enabled}</fs.azure.scale.test.enabled>
|
<fs.azure.scale.test.enabled>${fs.azure.scale.test.enabled}</fs.azure.scale.test.enabled>
|
||||||
|
@ -431,6 +433,7 @@
|
||||||
<fs.azure.scale.test.timeout>${fs.azure.scale.test.timeout}</fs.azure.scale.test.timeout>
|
<fs.azure.scale.test.timeout>${fs.azure.scale.test.timeout}</fs.azure.scale.test.timeout>
|
||||||
</systemPropertyVariables>
|
</systemPropertyVariables>
|
||||||
<forkedProcessTimeoutInSeconds>${fs.azure.scale.test.timeout}</forkedProcessTimeoutInSeconds>
|
<forkedProcessTimeoutInSeconds>${fs.azure.scale.test.timeout}</forkedProcessTimeoutInSeconds>
|
||||||
|
<trimStackTrace>false</trimStackTrace>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
|
|
Loading…
Reference in New Issue