[FLINK-8079][tests] Stop end-to-end test execution after first failure

This closes #5156.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/dcacdb91
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/dcacdb91
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/dcacdb91

Branch: refs/heads/master
Commit: dcacdb9161a7bae67203460c5ac34b64286fc535
Parents: 8fdea60
Author: zentol <[email protected]>
Authored: Tue Dec 12 14:04:34 2017 +0100
Committer: zentol <[email protected]>
Committed: Wed Jan 24 12:46:38 2018 +0100

----------------------------------------------------------------------
 tools/travis_mvn_watchdog.sh | 71 ++++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/dcacdb91/tools/travis_mvn_watchdog.sh
----------------------------------------------------------------------
diff --git a/tools/travis_mvn_watchdog.sh b/tools/travis_mvn_watchdog.sh
index 036ad29..0ebe14e 100755
--- a/tools/travis_mvn_watchdog.sh
+++ b/tools/travis_mvn_watchdog.sh
@@ -516,8 +516,9 @@ case $TEST in
        (connectors)
                if [ $EXIT_CODE == 0 ]; then
                        check_shaded_artifacts_s3_fs hadoop
+                       EXIT_CODE=$(($EXIT_CODE+$?))
                        check_shaded_artifacts_s3_fs presto
-                       EXIT_CODE=$?
+                       EXIT_CODE=$(($EXIT_CODE+$?))
                else
                        echo 
"=============================================================================="
                        echo "Compilation/test failure detected, skipping 
shaded dependency check."
@@ -540,35 +541,45 @@ case $TEST in
                        printf "Running end-to-end tests\n"
                        printf 
"==============================================================================\n"
 
-                       printf 
"\n==============================================================================\n"
-                       printf "Running Wordcount end-to-end test\n"
-                       printf 
"==============================================================================\n"
-                       FLINK_DIR=build-target CLUSTER_MODE=cluster 
test-infra/end-to-end-test/test_batch_wordcount.sh
-                       EXIT_CODE=$(($EXIT_CODE+$?))
-
-                       printf 
"\n==============================================================================\n"
-                       printf "Running Kafka end-to-end test\n"
-                       printf 
"==============================================================================\n"
-                       FLINK_DIR=build-target CLUSTER_MODE=cluster 
test-infra/end-to-end-test/test_streaming_kafka010.sh
-                       EXIT_CODE=$(($EXIT_CODE+$?))
-
-                       printf 
"\n==============================================================================\n"
-                       printf "Running class loading end-to-end test\n"
-                       printf 
"==============================================================================\n"
-                       FLINK_DIR=build-target CLUSTER_MODE=cluster 
test-infra/end-to-end-test/test_streaming_classloader.sh
-                       EXIT_CODE=$(($EXIT_CODE+$?))
-
-                       printf 
"\n==============================================================================\n"
-                       printf "Running Shaded Hadoop S3A end-to-end test\n"
-                       printf 
"==============================================================================\n"
-                       FLINK_DIR=build-target CLUSTER_MODE=cluster 
test-infra/end-to-end-test/test_shaded_hadoop_s3a.sh
-                       EXIT_CODE=$(($EXIT_CODE+$?))
-
-                       printf 
"\n==============================================================================\n"
-                       printf "Running Shaded Presto S3 end-to-end test\n"
-                       printf 
"==============================================================================\n"
-                       FLINK_DIR=build-target CLUSTER_MODE=cluster 
test-infra/end-to-end-test/test_shaded_presto_s3.sh
-                       EXIT_CODE=$(($EXIT_CODE+$?))
+                       if [ $EXIT_CODE == 0 ]; then
+                               printf 
"\n==============================================================================\n"
+                               printf "Running Wordcount end-to-end test\n"
+                               printf 
"==============================================================================\n"
+                               FLINK_DIR=build-target CLUSTER_MODE=cluster 
test-infra/end-to-end-test/test_batch_wordcount.sh
+                               EXIT_CODE=$?
+                       fi
+
+                       if [ $EXIT_CODE == 0 ]; then
+                               printf 
"\n==============================================================================\n"
+                               printf "Running Kafka end-to-end test\n"
+                               printf 
"==============================================================================\n"
+                               FLINK_DIR=build-target CLUSTER_MODE=cluster 
test-infra/end-to-end-test/test_streaming_kafka010.sh
+                               EXIT_CODE=$?
+                       fi
+
+                       if [ $EXIT_CODE == 0 ]; then
+                               printf 
"\n==============================================================================\n"
+                               printf "Running class loading end-to-end test\n"
+                               printf 
"==============================================================================\n"
+                               FLINK_DIR=build-target CLUSTER_MODE=cluster 
test-infra/end-to-end-test/test_streaming_classloader.sh
+                               EXIT_CODE=$?
+                       fi
+
+                       if [ $EXIT_CODE == 0 ]; then
+                               printf 
"\n==============================================================================\n"
+                               printf "Running Shaded Hadoop S3A end-to-end 
test\n"
+                               printf 
"==============================================================================\n"
+                               FLINK_DIR=build-target CLUSTER_MODE=cluster 
test-infra/end-to-end-test/test_shaded_hadoop_s3a.sh
+                               EXIT_CODE=$?
+                       fi
+
+                       if [ $EXIT_CODE == 0 ]; then
+                               printf 
"\n==============================================================================\n"
+                               printf "Running Shaded Presto S3 end-to-end 
test\n"
+                               printf 
"==============================================================================\n"
+                               FLINK_DIR=build-target CLUSTER_MODE=cluster 
test-infra/end-to-end-test/test_shaded_presto_s3.sh
+                               EXIT_CODE=$?
+                       fi                      
                else
                        printf 
"\n==============================================================================\n"
                        printf "Previous build failure detected, skipping 
end-to-end tests.\n"

Reply via email to