Merge pull request searchbox-io#511 from graylog-labs/travis

Try making Travis CI builds more stable
BigDataHunter · May 9, 2017 · 61866dd · 61866dd
2 parents e6a8539 + 2c279e3
commit 61866dd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: java
 dist: trusty
 jdk:
-  - openjdk8
+  - oraclejdk8
 sudo: false
 env:
   global:

diff --git a/jest/src/test/java/io/searchbox/cluster/NodesStatsIntegrationTest.java b/jest/src/test/java/io/searchbox/cluster/NodesStatsIntegrationTest.java
@@ -23,8 +23,7 @@ public class NodesStatsIntegrationTest extends AbstractIntegrationTest {
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        ensureClusterSizeConsistency();
-        ensureClusterStateConsistency();
+        ensureFullyConnectedCluster();
     }
 
     @Test

diff --git a/pom.xml b/pom.xml
@@ -514,12 +514,14 @@
                                     <excludes>
                                         <exclude>none</exclude>
                                     </excludes>
-                                    <argLine>-XX:+PrintGCDetails -Xmx${tests.heap.size} -Xms${tests.heap.size} -Dtests.heap.size=${tests.heap.size} -Djava.net.preferIPv4Stack=true -Dtests.security.manager=false</argLine>
+                                    <argLine>-Xmx${tests.heap.size} -Xms${tests.heap.size} -Dtests.heap.size=${tests.heap.size} -Djava.net.preferIPv4Stack=true -Dtests.security.manager=false</argLine>
+                                    <reuseForks>false</reuseForks>
                                 </configuration>
                             </execution>
                         </executions>
                         <configuration>
-                            <argLine>-XX:+PrintGCDetails -Xmx${tests.heap.size} -Xms${tests.heap.size} -Dtests.heap.size=${tests.heap.size} -Dtests.security.manager=false</argLine>
+                            <argLine>-Xmx${tests.heap.size} -Xms${tests.heap.size} -Dtests.heap.size=${tests.heap.size} -Dtests.security.manager=false</argLine>
+                            <reuseForks>false</reuseForks>
                         </configuration>
                     </plugin>
                 </plugins>