You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by fa...@apache.org on 2022/08/29 14:23:14 UTC
[incubator-seatunnel] branch dev updated: fix[#2546]:Running IT use cases under Windows requires replacing \ with / and start-seatunnel-flink-new-connector.sh need to use '#!/bin/sh' (#2547)
This is an automated email from the ASF dual-hosted git repository.
fanjia pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new 57a602443 fix[#2546]:Running IT use cases under Windows requires replacing \ with / and start-seatunnel-flink-new-connector.sh need to use '#!/bin/sh' (#2547)
57a602443 is described below
commit 57a60244325557179afef634dd731e952d984a47
Author: liugddx <80...@qq.com>
AuthorDate: Mon Aug 29 22:23:08 2022 +0800
fix[#2546]:Running IT use cases under Windows requires replacing \ with / and start-seatunnel-flink-new-connector.sh need to use '#!/bin/sh' (#2547)
---
.../src/main/bin/start-seatunnel-flink-new-connector.sh | 2 +-
.../src/test/java/org/apache/seatunnel/e2e/flink/FlinkContainer.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/bin/start-seatunnel-flink-new-connector.sh b/seatunnel-core/seatunnel-flink-starter/src/main/bin/start-seatunnel-flink-new-connector.sh
index 0c276319b..c530e364a 100755
--- a/seatunnel-core/seatunnel-flink-starter/src/main/bin/start-seatunnel-flink-new-connector.sh
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/bin/start-seatunnel-flink-new-connector.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/flink/FlinkContainer.java b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/flink/FlinkContainer.java
index c280b3594..7d80707e8 100644
--- a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/flink/FlinkContainer.java
+++ b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/flink/FlinkContainer.java
@@ -116,8 +116,9 @@ public abstract class FlinkContainer {
// Running IT use cases under Windows requires replacing \ with /
String conf = targetConfInContainer.replaceAll("\\\\", "/");
+ String binPath = Paths.get(SEATUNNEL_HOME, "bin", SEATUNNEL_FLINK_BIN).toString().replaceAll("\\\\", "/");
final List<String> command = new ArrayList<>();
- command.add(Paths.get(SEATUNNEL_HOME, "bin", SEATUNNEL_FLINK_BIN).toString());
+ command.add(binPath);
command.add("--config " + conf);
Container.ExecResult execResult = jobManager.execInContainer("bash", "-c", String.join(" ", command));