beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dhalp...@apache.org
Subject [1/2] incubator-beam git commit: Add Surefire Max Heap Size argument
Date Wed, 29 Jun 2016 17:44:31 GMT
Repository: incubator-beam
Updated Branches:
  refs/heads/master daafc86f3 -> ee5127599


Add Surefire Max Heap Size argument

Remove Travis Maven overrides. Fork in Travis CI.


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/941b15ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/941b15ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/941b15ab

Branch: refs/heads/master
Commit: 941b15aba587d76d8dcb4688dd14ff4ca7bf4fef
Parents: daafc86
Author: Thomas Groh <tgroh@google.com>
Authored: Tue Jun 28 09:26:31 2016 -0700
Committer: Dan Halperin <dhalperi@google.com>
Committed: Wed Jun 29 10:44:25 2016 -0700

----------------------------------------------------------------------
 .travis.yml           | 9 +++++----
 pom.xml               | 4 ++++
 runners/flink/pom.xml | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/941b15ab/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 6d81689..45bad9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,16 +35,17 @@ matrix:
       env: MAVEN_OVERRIDE=""
     # On Linux, run with specific JDKs only.
     - os: linux
-      env: CUSTOM_JDK="oraclejdk8" MAVEN_OVERRIDE="-DforkCount=0"
+      env: CUSTOM_JDK="oraclejdk8" MAVEN_OVERRIDE="-DbeamSurefireArgline='-Xmx512m'"
     - os: linux
-      env: CUSTOM_JDK="oraclejdk7" MAVEN_OVERRIDE="-DforkCount=0"
+      env: CUSTOM_JDK="oraclejdk7" MAVEN_OVERRIDE="-DbeamSurefireArgline='-Xmx512m'"
     - os: linux
-      env: CUSTOM_JDK="openjdk7" MAVEN_OVERRIDE="-DforkCount=0"
+      env: CUSTOM_JDK="openjdk7" MAVEN_OVERRIDE="-DbeamSurefireArgline='-Xmx512m'"
 
 before_install:
-  - echo "MAVEN_OPTS='-Xmx2048m -XX:MaxPermSize=512m'" > ~/.mavenrc
+  - echo "MAVEN_OPTS='-Xmx1024m -XX:MaxPermSize=512m'" > ~/.mavenrc
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export JAVA_HOME=$(/usr/libexec/java_home); fi
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then jdk_switcher use "$CUSTOM_JDK"; fi
+  - export BEAM_SUREFIRE_ARGLINE="-Xmx512m"
 
 install:
   - travis_retry mvn -B install clean -U -DskipTests=true

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/941b15ab/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bf59132..6848973 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,6 +101,9 @@
     <!-- Disable integration tests by default -->
     <skipITs>true</skipITs>
 
+    <!-- Do not add additional surefire arguments by default -->
+    <beamSurefireArgline></beamSurefireArgline>
+
     <!-- If updating dependencies, please update any relevant javadoc offlineLinks -->
     <avro.version>1.7.7</avro.version>
     <bigquery.version>v2-rev295-1.22.0</bigquery.version>
@@ -790,6 +793,7 @@
             <useManifestOnlyJar>false</useManifestOnlyJar>
             <trimStackTrace>false</trimStackTrace>
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
+            <argLine>${beamSurefireArgline}</argLine>
           </configuration>
           <dependencies>
             <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/941b15ab/runners/flink/pom.xml
----------------------------------------------------------------------
diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml
index d69eb88..bea639e 100644
--- a/runners/flink/pom.xml
+++ b/runners/flink/pom.xml
@@ -73,7 +73,7 @@
           </executions>
           <configuration>
             <forkCount>1</forkCount>
-            <argLine>-Dlog4j.configuration=log4j-test.properties  -XX:-UseGCOverheadLimit</argLine>
+            <argLine>-Dlog4j.configuration=log4j-test.properties  -XX:-UseGCOverheadLimit
${beamSurefireArgline}</argLine>
           </configuration>
         </plugin>
 
@@ -82,7 +82,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <configuration>
-            <argLine>-Dlog4j.configuration=log4j-test.properties  -XX:-UseGCOverheadLimit</argLine>
+            <argLine>-Dlog4j.configuration=log4j-test.properties  -XX:-UseGCOverheadLimit
${beamSurefireArgline}</argLine>
           </configuration>
         </plugin>
 


Mime
View raw message