Revert "[FLINK-12143][e2e] Change end-to-end tests with file system t…

…o use plugins mechanism" This reverts commit 9e6ff81.
mbalassi · Jun 14, 2019 · 24246b8 · 24246b8
1 parent e6ba90c
commit 24246b8
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 31 deletions.
diff --git a/flink-end-to-end-tests/test-scripts/common_dummy_fs.sh b/flink-end-to-end-tests/test-scripts/common_dummy_fs.sh
diff --git a/flink-end-to-end-tests/test-scripts/common_s3.sh b/flink-end-to-end-tests/test-scripts/common_s3.sh
@@ -63,7 +63,7 @@ s3util="java -jar ${END_TO_END_DIR}/flink-e2e-test-utils/target/S3UtilProgram.ja
 # None
 ###################################
 function s3_setup {
- add_optional_plugin "s3-fs-$1"
+ add_optional_lib "s3-fs-$1"
  set_config_key "s3.access-key" "$IT_CASE_S3_ACCESS_KEY"
  set_config_key "s3.secret-key" "$IT_CASE_S3_SECRET_KEY"
 }

diff --git a/flink-end-to-end-tests/test-scripts/test_azure_fs.sh b/flink-end-to-end-tests/test-scripts/test_azure_fs.sh
@@ -61,7 +61,7 @@ AZURE_TEST_DATA_WORDS_URI="wasbs:https://$IT_CASE_AZURE_CONTAINER@$IT_CASE_AZURE_ACCOU
 function azure_setup {
 
  echo "Copying flink azure jars and writing out configs"
- add_optional_plugin "azure-fs-hadoop"
+ add_optional_lib "azure-fs-hadoop"
  set_config_key "fs.azure.account.key.$IT_CASE_AZURE_ACCOUNT.blob.core.windows.net" "$IT_CASE_AZURE_ACCESS_KEY"
 }
 

diff --git a/flink-end-to-end-tests/test-scripts/test_batch_wordcount.sh b/flink-end-to-end-tests/test-scripts/test_batch_wordcount.sh
@@ -35,8 +35,7 @@ case $INPUT_TYPE in
  INPUT_LOCATION="${S3_TEST_DATA_WORDS_URI}"
  ;;
  (dummy-fs)
- source "$(dirname "$0")"/common_dummy_fs.sh
- dummy_fs_setup
+ cp "${END_TO_END_DIR}/flink-plugins-test/target/flink-dummy-fs.jar" "${FLINK_DIR}/lib/"
  INPUT_LOCATION="dummy:https://localhost/words"
  ;;
  (*)

diff --git a/flink-end-to-end-tests/test-scripts/test_docker_embedded_job.sh b/flink-end-to-end-tests/test-scripts/test_docker_embedded_job.sh
@@ -37,8 +37,7 @@ case $INPUT_TYPE in
  INPUT_LOCATION=${INPUT_PATH}/words
  ;;
  (dummy-fs)
- source "$(dirname "$0")"/common_dummy_fs.sh
- dummy_fs_setup
+ cp "${END_TO_END_DIR}/flink-plugins-test/target/flink-dummy-fs.jar" "${FLINK_DIR}/lib/"
  INPUT_LOCATION="dummy:https://localhost/words"
  ;;
  (*)

diff --git a/flink-end-to-end-tests/test-scripts/test_yarn_kerberos_docker.sh b/flink-end-to-end-tests/test-scripts/test_yarn_kerberos_docker.sh
@@ -43,8 +43,7 @@ case $INPUT_TYPE in
  EXPECTED_RESULT_LOG_CONTAINS=("consummation,1" "of,14" "calamity,1")
  ;;
  (dummy-fs)
- source "$(dirname "$0")"/common_dummy_fs.sh
- dummy_fs_setup
+ cp "${END_TO_END_DIR}/flink-plugins-test/target/flink-dummy-fs.jar" "${FLINK_DIR}/lib/"
  INPUT_ARGS="--input dummy:https://localhost/words"
  EXPECTED_RESULT_LOG_CONTAINS=("my,1" "dear,2" "world,2")
  ;;