zhuzhurk commented on code in PR #24177:
URL: https://github.com/apache/flink/pull/24177#discussion_r1464880838
##########
flink-end-to-end-tests/test-scripts/common_docker.sh:
##########
@@ -48,7 +48,8 @@ function build_image() {
local server_pid=$!
echo "Preparing Dockeriles"
- retry_times_with_exponential_backoff 5 git clone
https://github.com/apache/flink-docker.git --branch dev-master --single-branch
+ # TODO only for test, after FLINK-34205 we should revert this change
+ retry_times_with_exponential_backoff 5 git clone
https://github.com/JunRuiLee/flink-docker.git --branch using_bash_java_utils
--single-branch
Review Comment:
The change needs to be updated.
##########
flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/BootstrapTools.java:
##########
@@ -41,7 +41,6 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.Map;
import java.util.stream.Stream;
Review Comment:
This hotfix is already done in flink master.
##########
flink-end-to-end-tests/test-scripts/common.sh:
##########
@@ -50,6 +50,14 @@ TEST_INFRA_DIR=`pwd -P`
cd $TEST_ROOT
source "${TEST_INFRA_DIR}/common_utils.sh"
+source "${FLINK_DIR}/bin/bash-java-utils.sh"
+
+if [[ -z "${FLINK_CONF_DIR:-}" ]]; then
+ FLINK_CONF_DIR="$FLINK_DIR/conf"
+fi
+FLINK_CONF=${FLINK_CONF_DIR}/config.yaml
+output=$(updateAndGetFlinkConfiguration "${FLINK_CONF_DIR}" "${FLINK_DIR}/bin"
"${FLINK_DIR}/lib" -flatten)
Review Comment:
Maybe add a comment here to state that a flattened config file is required
because many cases will modify the config file.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
