This is an automated email from the ASF dual-hosted git repository. twalthr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 17a59f08ab1e6d291c7a076cae324519c0c19e8e Author: Timo Walther <[email protected]> AuthorDate: Tue Nov 17 16:48:19 2020 +0100 [hotfix][e2e] Simplify SQL client e2e testing matrix --- flink-end-to-end-tests/run-nightly-tests.sh | 6 ++---- .../test-scripts/test_sql_client.sh | 22 +++++++++------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/flink-end-to-end-tests/run-nightly-tests.sh b/flink-end-to-end-tests/run-nightly-tests.sh index e44efdd..3bb4ec4 100755 --- a/flink-end-to-end-tests/run-nightly-tests.sh +++ b/flink-end-to-end-tests/run-nightly-tests.sh @@ -210,10 +210,8 @@ fi run_test "State TTL Heap backend end-to-end test" "$END_TO_END_DIR/test-scripts/test_stream_state_ttl.sh file" "skip_check_exceptions" run_test "State TTL RocksDb backend end-to-end test" "$END_TO_END_DIR/test-scripts/test_stream_state_ttl.sh rocks" "skip_check_exceptions" -run_test "SQL Client end-to-end test (Old planner) Elasticsearch (v6.3.1)" "$END_TO_END_DIR/test-scripts/test_sql_client.sh old 6" -run_test "SQL Client end-to-end test (Old planner) Elasticsearch (v7.5.1)" "$END_TO_END_DIR/test-scripts/test_sql_client.sh old 7" -run_test "SQL Client end-to-end test (Blink planner) Elasticsearch (v6.3.1)" "$END_TO_END_DIR/test-scripts/test_sql_client.sh blink 6" -run_test "SQL Client end-to-end test (Blink planner) Elasticsearch (v7.5.1)" "$END_TO_END_DIR/test-scripts/test_sql_client.sh blink 7" +run_test "SQL Client end-to-end test (Old planner) Elasticsearch (v7.5.1)" "$END_TO_END_DIR/test-scripts/test_sql_client.sh old" +run_test "SQL Client end-to-end test (Blink planner) Elasticsearch (v7.5.1)" "$END_TO_END_DIR/test-scripts/test_sql_client.sh blink" run_test "TPC-H end-to-end test (Blink planner)" "$END_TO_END_DIR/test-scripts/test_tpch.sh" run_test "TPC-DS end-to-end test (Blink planner)" "$END_TO_END_DIR/test-scripts/test_tpcds.sh" diff --git a/flink-end-to-end-tests/test-scripts/test_sql_client.sh b/flink-end-to-end-tests/test-scripts/test_sql_client.sh index 65f297b..5899ce1 100755 --- a/flink-end-to-end-tests/test-scripts/test_sql_client.sh +++ b/flink-end-to-end-tests/test-scripts/test_sql_client.sh @@ -20,16 +20,14 @@ set -Eeuo pipefail PLANNER="${1:-old}" -ELASTICSEARCH_VERSION=${2:-6} KAFKA_VERSION="2.2.2" CONFLUENT_VERSION="5.0.0" CONFLUENT_MAJOR_VERSION="5.0" KAFKA_SQL_VERSION="universal" - -ELASTICSEARCH6_DOWNLOAD_URL='https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.3.1.tar.gz' -ELASTICSEARCH7_MAC_DOWNLOAD_URL='https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.5.1-darwin-x86_64.tar.gz' -ELASTICSEARCH7_LINUX_DOWNLOAD_URL='https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.5.1-linux-x86_64.tar.gz' +ELASTICSEARCH_VERSION=7 +ELASTICSEARCH_MAC_DOWNLOAD_URL='https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.5.1-darwin-x86_64.tar.gz' +ELASTICSEARCH_LINUX_DOWNLOAD_URL='https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.5.1-linux-x86_64.tar.gz' source "$(dirname "$0")"/common.sh source "$(dirname "$0")"/kafka_sql_common.sh \ @@ -104,7 +102,7 @@ function sql_cleanup() { on_exit sql_cleanup function prepare_elasticsearch { - echo "Preparing Elasticsearch(version=$ELASTICSEARCH_VERSION)..." + echo "Preparing Elasticsearch (version=$ELASTICSEARCH_VERSION)..." # elastcisearch offers different release binary file for corresponding system since version 7. case "$(uname -s)" in Linux*) OS_TYPE=linux;; @@ -112,14 +110,12 @@ function prepare_elasticsearch { *) OS_TYPE="UNKNOWN:${unameOut}" esac - if [[ "$ELASTICSEARCH_VERSION" == 6 ]]; then - DOWNLOAD_URL=$ELASTICSEARCH6_DOWNLOAD_URL - elif [[ "$ELASTICSEARCH_VERSION" == 7 ]] && [[ "$OS_TYPE" == "mac" ]]; then - DOWNLOAD_URL=$ELASTICSEARCH7_MAC_DOWNLOAD_URL - elif [[ "$ELASTICSEARCH_VERSION" == 7 ]] && [[ "$OS_TYPE" == "linux" ]]; then - DOWNLOAD_URL=$ELASTICSEARCH7_LINUX_DOWNLOAD_URL + if [[ "$OS_TYPE" == "mac" ]]; then + DOWNLOAD_URL=$ELASTICSEARCH_MAC_DOWNLOAD_URL + elif [[ "$OS_TYPE" == "linux" ]]; then + DOWNLOAD_URL=$ELASTICSEARCH_LINUX_DOWNLOAD_URL else - echo "[ERROR] Unsupported elasticsearch version($ELASTICSEARCH_VERSION) for OS: $OS_TYPE" + echo "[ERROR] Unsupported OS for Elasticsearch: $OS_TYPE" exit 1 fi
