[tests] Add CI property for CI tests on Travis and increase connectio…

…n timeout
apache · Sep 21, 2015 · 2d4fbc0 · 2d4fbc0
1 parent d91784d
commit 2d4fbc0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/ZooKeeperTestUtils.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/ZooKeeperTestUtils.java
@@ -69,8 +69,16 @@ public static Configuration setZooKeeperRecoveryMode(
 		config.setString(ConfigConstants.ZOOKEEPER_QUORUM_KEY, zooKeeperQuorum);
 
 		// Lower ZooKeeper client timeouts to decrease test time.
-		config.setInteger(ConfigConstants.ZOOKEEPER_CONNECTION_TIMEOUT, 5000);
-		config.setInteger(ConfigConstants.ZOOKEEPER_SESSION_TIMEOUT, 5000);
+		String testEnvironment = System.getProperty("env.ci");
+
+		int connTimeout = 5000;
+		if (testEnvironment != null && testEnvironment.equals("travis")) {
+			// The regular timeout is to aggressive for Travis and connections are often lost.
+			connTimeout = 20000;
+		}
+
+		config.setInteger(ConfigConstants.ZOOKEEPER_CONNECTION_TIMEOUT, connTimeout);
+		config.setInteger(ConfigConstants.ZOOKEEPER_SESSION_TIMEOUT, connTimeout);
 
 		// File system state backend
 		config.setString(ConfigConstants.STATE_BACKEND, "FILESYSTEM");

diff --git a/tools/travis_mvn_watchdog.sh b/tools/travis_mvn_watchdog.sh
@@ -45,7 +45,7 @@ LOG4J_PROPERTIES=${HERE}/log4j-travis.properties
 
 # Maven command to run. We set the forkCount manually, because otherwise Maven sees too many cores
 # on the Travis VMs.
-MVN="mvn -Dflink.forkCount=2 -B $PROFILE -Dlog.dir=${ARTIFACTS_DIR} -Dlog4j.configuration=file://$LOG4J_PROPERTIES clean install"
+MVN="mvn -Denv.ci=travis -Dflink.forkCount=2 -B $PROFILE -Dlog.dir=${ARTIFACTS_DIR} -Dlog4j.configuration=file://$LOG4J_PROPERTIES clean install"
 
 MVN_PID="${ARTIFACTS_DIR}/watchdog.mvn.pid"
 MVN_EXIT="${ARTIFACTS_DIR}/watchdog.mvn.exit"