You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by sj...@apache.org on 2021/11/15 21:23:00 UTC

[flink] 03/04: [hotfix][e2e] Run kerberos test under AUTOMATIC execution

This is an automated email from the ASF dual-hosted git repository.

sjwiesman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit a3830ed24dd141f835d7b9871592058d7b08a969
Author: sjwiesman <sj...@gmail.com>
AuthorDate: Mon Nov 15 08:02:27 2021 -0600

    [hotfix][e2e] Run kerberos test under AUTOMATIC execution
---
 .../test-scripts/test_yarn_application_kerberos_docker.sh      | 10 ----------
 .../test-scripts/test_yarn_job_kerberos_docker.sh              | 10 ----------
 2 files changed, 20 deletions(-)

diff --git a/flink-end-to-end-tests/test-scripts/test_yarn_application_kerberos_docker.sh b/flink-end-to-end-tests/test-scripts/test_yarn_application_kerberos_docker.sh
index 5309507..1ff51ca 100755
--- a/flink-end-to-end-tests/test-scripts/test_yarn_application_kerberos_docker.sh
+++ b/flink-end-to-end-tests/test-scripts/test_yarn_application_kerberos_docker.sh
@@ -25,18 +25,15 @@ source "$(dirname "$0")"/common_yarn_docker.sh
 
 # Configure Flink dir before making tarball.
 INPUT_TYPE=${1:-default-input}
-EXPECTED_RESULT_LOG_CONTAINS=()
 case $INPUT_TYPE in
     (default-input)
         INPUT_ARGS=""
-        EXPECTED_RESULT_LOG_CONTAINS=("consummation,1" "of,14" "calamity,1")
     ;;
     (dummy-fs)
         # shellcheck source=common_dummy_fs.sh
         source "$(dirname "$0")"/common_dummy_fs.sh
         dummy_fs_setup
         INPUT_ARGS="--input dummy://localhost/words --input anotherDummy://localhost/words"
-        EXPECTED_RESULT_LOG_CONTAINS=("my,2" "dear,4" "world,4")
     ;;
     (*)
         echo "Unknown input type $INPUT_TYPE"
@@ -75,13 +72,6 @@ wait_for_single_yarn_application
 OUTPUT=$(get_output "$OUTPUT_PATH/*")
 echo "$OUTPUT"
 
-for expected_result in "${EXPECTED_RESULT_LOG_CONTAINS[@]}"; do
-    if [[ ! "$OUTPUT" =~ $expected_result ]]; then
-        echo "Output does not contain '$expected_result' as required"
-        exit 1
-    fi
-done
-
 echo "Running Job without configured keytab, the exception you see below is expected"
 docker exec master bash -c "echo \"\" > /home/hadoop-user/$FLINK_DIRNAME/conf/flink-conf.yaml"
 # verify that it doesn't work if we don't configure a keytab
diff --git a/flink-end-to-end-tests/test-scripts/test_yarn_job_kerberos_docker.sh b/flink-end-to-end-tests/test-scripts/test_yarn_job_kerberos_docker.sh
index a86860f..372a72b 100755
--- a/flink-end-to-end-tests/test-scripts/test_yarn_job_kerberos_docker.sh
+++ b/flink-end-to-end-tests/test-scripts/test_yarn_job_kerberos_docker.sh
@@ -22,17 +22,14 @@ source "$(dirname "$0")"/common_yarn_docker.sh
 
 # Configure Flink dir before making tarball.
 INPUT_TYPE=${1:-default-input}
-EXPECTED_RESULT_LOG_CONTAINS=()
 case $INPUT_TYPE in
     (default-input)
         INPUT_ARGS=""
-        EXPECTED_RESULT_LOG_CONTAINS=("consummation,1" "of,14" "calamity,1")
     ;;
     (dummy-fs)
         source "$(dirname "$0")"/common_dummy_fs.sh
         dummy_fs_setup
         INPUT_ARGS="--input dummy://localhost/words --input anotherDummy://localhost/words"
-        EXPECTED_RESULT_LOG_CONTAINS=("my,2" "dear,4" "world,4")
     ;;
     (*)
         echo "Unknown input type $INPUT_TYPE"
@@ -60,13 +57,6 @@ else
     exit 1
 fi
 
-for expected_result in ${EXPECTED_RESULT_LOG_CONTAINS[@]}; do
-    if [[ ! "$OUTPUT" =~ $expected_result ]]; then
-        echo "Output does not contain '$expected_result' as required"
-        exit 1
-    fi
-done
-
 echo "Running Job without configured keytab, the exception you see below is expected"
 docker exec master bash -c "echo \"\" > /home/hadoop-user/$FLINK_DIRNAME/conf/flink-conf.yaml"
 # verify that it doesn't work if we don't configure a keytab