You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/07/26 10:16:08 UTC
[2/5] flink git commit: [FLINK-7264] [travis] Kill watchdog only
after compilation&tests
[FLINK-7264] [travis] Kill watchdog only after compilation&tests
This closes #4396.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d0c3524c
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d0c3524c
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d0c3524c
Branch: refs/heads/master
Commit: d0c3524c134f00da6c3ddc3e87f6c63181fcd440
Parents: 0feb08b
Author: zentol <ch...@apache.org>
Authored: Tue Jul 25 15:37:03 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Wed Jul 26 10:50:17 2017 +0200
----------------------------------------------------------------------
tools/travis_mvn_watchdog.sh | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d0c3524c/tools/travis_mvn_watchdog.sh
----------------------------------------------------------------------
diff --git a/tools/travis_mvn_watchdog.sh b/tools/travis_mvn_watchdog.sh
index 724dc35..b67ac3e 100755
--- a/tools/travis_mvn_watchdog.sh
+++ b/tools/travis_mvn_watchdog.sh
@@ -335,11 +335,6 @@ echo "RUNNING '${MVN_COMPILE}'."
# the exit code. This is important for Travis' build life-cycle (success/failure).
( $MVN_COMPILE & PID=$! ; echo $PID >&3 ; wait $PID ; echo $? >&4 ) 3>$MVN_PID 4>$MVN_EXIT | tee $MVN_OUT
-echo "Trying to KILL watchdog (${WD_PID})."
-
-# Make sure to kill the watchdog in any case after $MVN has completed
-( kill $WD_PID 2>&1 ) > /dev/null
-
EXIT_CODE=$(<$MVN_EXIT)
echo "MVN exited with EXIT CODE: ${EXIT_CODE}."
@@ -357,11 +352,6 @@ if [ $EXIT_CODE == 0 ]; then
# the exit code. This is important for Travis' build life-cycle (success/failure).
( $MVN_TEST & PID=$! ; echo $PID >&3 ; wait $PID ; echo $? >&4 ) 3>$MVN_PID 4>$MVN_EXIT | tee $MVN_OUT
- echo "Trying to KILL watchdog (${WD_PID})."
-
- # Make sure to kill the watchdog in any case after $MVN has completed
- ( kill $WD_PID 2>&1 ) > /dev/null
-
EXIT_CODE=$(<$MVN_EXIT)
echo "MVN exited with EXIT CODE: ${EXIT_CODE}."
@@ -376,6 +366,10 @@ fi
# Post
+# Make sure to kill the watchdog in any case after $MVN_COMPILE and $MVN_TEST have completed
+echo "Trying to KILL watchdog (${WD_PID})."
+( kill $WD_PID 2>&1 ) > /dev/null
+
# only misc builds flink-dist and flink-yarn-tests
case $TEST in
(misc)