Repository: flink Updated Branches: refs/heads/master f5471bdcb -> 6b451d949
[FLINK-6506] [build] Tests in flink-tests exceed memory resources on containerized Travis Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/6b451d94 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/6b451d94 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/6b451d94 Branch: refs/heads/master Commit: 6b451d949a47a3996d47e248b06b4b8fd1226c5d Parents: f5471bd Author: Stefan Richter <s.rich...@data-artisans.com> Authored: Mon May 8 12:09:22 2017 +0200 Committer: Stefan Richter <s.rich...@data-artisans.com> Committed: Tue May 9 11:18:47 2017 +0200 ---------------------------------------------------------------------- flink-tests/pom.xml | 3 +++ tools/travis_mvn_watchdog.sh | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/6b451d94/flink-tests/pom.xml ---------------------------------------------------------------------- diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml index ff16349..ebee6ef 100644 --- a/flink-tests/pom.xml +++ b/flink-tests/pom.xml @@ -342,6 +342,9 @@ under the License. <classpathDependencyExclude>org.apache.curator:curator-client</classpathDependencyExclude> <classpathDependencyExclude>org.apache.curator:curator-framework</classpathDependencyExclude> </classpathDependencyExcludes> + <!-- We override the fork behaviour for those expensive tests to avoid process + kills due to container limits on travis --> + <forkCount>${flink.forkCountTestPackage}</forkCount> <reuseForks>false</reuseForks> <environmentVariables> <!-- Make sure external hadoop environment will not affect maven building --> http://git-wip-us.apache.org/repos/asf/flink/blob/6b451d94/tools/travis_mvn_watchdog.sh ---------------------------------------------------------------------- diff --git a/tools/travis_mvn_watchdog.sh b/tools/travis_mvn_watchdog.sh index 20afa87..d747f91 100755 --- 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 -Dflink.forkCount=2 -Dflink.forkCountTestPackage=1 -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" @@ -75,6 +75,7 @@ upload_artifacts_s3() { echo "COMPRESSING build artifacts." cd $ARTIFACTS_DIR + dmesg > container.log tar -zcvf $ARTIFACTS_FILE * # Upload to secured S3
