Merge pull request prestodb#3 from treasure-data/circleci-mem

Run tests in circle.yml
miniway · May 11, 2015 · 3160dc9 · 3160dc9
2 parents d757a01 + bb6175b
commit 3160dc9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Rakefile b/Rakefile
@@ -37,7 +37,7 @@ end
 
 desc "run tests"
 task "test" do
-  sh "mvn #{active_modules.join(",")} test"
+  sh "mvn -pl #{active_modules.join(",")} test"
 end
 
 desc "set a unique version and td-specific settings"

diff --git a/circle.yml b/circle.yml
@@ -5,7 +5,7 @@ machine:
   java:
     version: oraclejdk8
   environment:
-    MAVEN_OPTS: -Xmx3g
+    MAVEN_OPTS: -Xmx6g
     M2_HOME: $HOME/.m2/apache-maven-3.2.5  # .m2 is cached
     M2:      $HOME/.m2/apache-maven-3.2.5/bin
     PATH:    $HOME/.m2/apache-maven-3.2.5/bin:$PATH
@@ -23,8 +23,9 @@ dependencies:
 
 test:
   override:
-    # Do nothing since Presto tests cannot be finished under 4GB memory limit of CircleCI
-    - echo skip tests
+    # Currently CircleCI provides us 8GB container, so mvn test will work. 
+    # Running tests only in master branch
+    - if [ "$CIRCLE_BRANCH" = "master" ]; then rake test; fi
 
 deployment:
   all: