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 2018/12/18 11:14:22 UTC
[flink] branch release-1.7 updated: [FLINK-11100][s3][tests] Add FS
type argument to s3_setup
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.7
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.7 by this push:
new 076907f [FLINK-11100][s3][tests] Add FS type argument to s3_setup
076907f is described below
commit 076907f7fd23e3d64264b91f6b0ef076b637284f
Author: zentol <ch...@apache.org>
AuthorDate: Fri Dec 7 13:09:05 2018 +0100
[FLINK-11100][s3][tests] Add FS type argument to s3_setup
---
flink-end-to-end-tests/test-scripts/common_s3.sh | 6 ++----
flink-end-to-end-tests/test-scripts/test_shaded_hadoop_s3a.sh | 1 +
flink-end-to-end-tests/test-scripts/test_shaded_presto_s3.sh | 1 +
flink-end-to-end-tests/test-scripts/test_streaming_file_sink.sh | 1 +
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/flink-end-to-end-tests/test-scripts/common_s3.sh b/flink-end-to-end-tests/test-scripts/common_s3.sh
index fbe8cad..63fa941 100644
--- a/flink-end-to-end-tests/test-scripts/common_s3.sh
+++ b/flink-end-to-end-tests/test-scripts/common_s3.sh
@@ -58,7 +58,7 @@ s3util="java -jar ${END_TO_END_DIR}/flink-e2e-test-utils/target/S3UtilProgram.ja
# IT_CASE_S3_ACCESS_KEY
# IT_CASE_S3_SECRET_KEY
# Arguments:
-# None
+# $1 - s3 filesystem type (hadoop/presto)
# Returns:
# None
###################################
@@ -73,13 +73,11 @@ function s3_setup {
}
trap s3_cleanup EXIT
- cp $FLINK_DIR/opt/flink-s3-fs-hadoop-*.jar $FLINK_DIR/lib/
+ cp $FLINK_DIR/opt/flink-s3-fs-$1-*.jar $FLINK_DIR/lib/
echo "s3.access-key: $IT_CASE_S3_ACCESS_KEY" >> "$FLINK_DIR/conf/flink-conf.yaml"
echo "s3.secret-key: $IT_CASE_S3_SECRET_KEY" >> "$FLINK_DIR/conf/flink-conf.yaml"
}
-s3_setup
-
###################################
# List s3 objects by full path prefix.
#
diff --git a/flink-end-to-end-tests/test-scripts/test_shaded_hadoop_s3a.sh b/flink-end-to-end-tests/test-scripts/test_shaded_hadoop_s3a.sh
index 489d0df..ddbb686 100755
--- a/flink-end-to-end-tests/test-scripts/test_shaded_hadoop_s3a.sh
+++ b/flink-end-to-end-tests/test-scripts/test_shaded_hadoop_s3a.sh
@@ -22,6 +22,7 @@
source "$(dirname "$0")"/common.sh
source "$(dirname "$0")"/common_s3.sh
+s3_setup hadoop
start_cluster
$FLINK_DIR/bin/flink run -p 1 $FLINK_DIR/examples/batch/WordCount.jar --input $S3_TEST_DATA_WORDS_URI --output $TEST_DATA_DIR/out/wc_out
diff --git a/flink-end-to-end-tests/test-scripts/test_shaded_presto_s3.sh b/flink-end-to-end-tests/test-scripts/test_shaded_presto_s3.sh
index a963e09..9ebbb0d 100755
--- a/flink-end-to-end-tests/test-scripts/test_shaded_presto_s3.sh
+++ b/flink-end-to-end-tests/test-scripts/test_shaded_presto_s3.sh
@@ -22,6 +22,7 @@
source "$(dirname "$0")"/common.sh
source "$(dirname "$0")"/common_s3.sh
+s3_setup presto
start_cluster
$FLINK_DIR/bin/flink run -p 1 $FLINK_DIR/examples/batch/WordCount.jar --input $S3_TEST_DATA_WORDS_URI --output $TEST_DATA_DIR/out/wc_out
diff --git a/flink-end-to-end-tests/test-scripts/test_streaming_file_sink.sh b/flink-end-to-end-tests/test-scripts/test_streaming_file_sink.sh
index e810e68..2756197 100755
--- a/flink-end-to-end-tests/test-scripts/test_streaming_file_sink.sh
+++ b/flink-end-to-end-tests/test-scripts/test_streaming_file_sink.sh
@@ -22,6 +22,7 @@ OUT_TYPE="${1:-local}" # other type: s3
source "$(dirname "$0")"/common.sh
source "$(dirname "$0")"/common_s3.sh
+s3_setup hadoop
set_conf_ssl "mutual"
OUT=temp/test_streaming_file_sink-$(uuidgen)