You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by ga...@apache.org on 2022/10/28 04:03:55 UTC
[incubator-seatunnel] branch dev updated: [Improve][CI] Fix ci ut it error (#3210)
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 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 56e1addb2 [Improve][CI] Fix ci ut it error (#3210)
56e1addb2 is described below
commit 56e1addb2cc767b0d7b1b20ed20e3c08ac472b56
Author: Eric <ga...@gmail.com>
AuthorDate: Fri Oct 28 12:03:50 2022 +0800
[Improve][CI] Fix ci ut it error (#3210)
* fix ut error when only e2e code update
* We don't run all connector e2e when engine module update
---
.github/workflows/backend.yml | 7 +++----
.../engine/common/config/YamlSeaTunnelDomConfigProcessor.java | 1 -
tools/update_modules_check/update_modules_check.py | 5 +++--
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index a5f642d74..4f575b462 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -131,9 +131,7 @@ jobs:
- "seatunnel-e2e/seatunnel-spark-e2e/**"
- "seatunnel-connectors/**"
- "plugin-mapping.properties"
- - "**/tools/**"
- "pom.xml"
- - "**/workflows/**"
engine:
- "seatunnel-engine/**"
engine-e2e:
@@ -199,10 +197,10 @@ jobs:
run: |
modules='${{ steps.engine-modules.outputs.modules }}${{ steps.cv2-modules.outputs.modules }}'
modules=${modules: 1}
- echo $modules
includes=`python tools/update_modules_check/update_modules_check.py tree $modules`
./mvnw -Pno_dist -D"e2e.dependency.skip"=false dependency:tree $includes -DoutputType=text -DoutputFile=/tmp/tree_out.txt
modules=`python tools/update_modules_check/update_modules_check.py final /tmp/tree_out.txt`
+ echo $modules
echo "modules=$modules" >> $GITHUB_OUTPUT
- name: Make integration test modules
@@ -211,10 +209,10 @@ jobs:
run: |
modules='${{ steps.cv2-e2e-modules.outputs.modules }}${{ steps.cv2-flink-e2e-modules.outputs.modules }}${{ steps.cv2-spark-e2e-modules.outputs.modules }}${{ steps.engine-e2e-modules.outputs.modules }}${{ steps.engine-modules.outputs.modules }}${{ steps.cv2-modules.outputs.modules }}'
modules=${modules: 1}
- echo $modules
includes=`python tools/update_modules_check/update_modules_check.py tree $modules`
./mvnw -Pno_dist -D"e2e.dependency.skip"=false dependency:tree $includes -DoutputType=text -DoutputFile=/tmp/tree_out.txt
modules=`python tools/update_modules_check/update_modules_check.py final /tmp/tree_out.txt`
+ echo $modules
echo "modules=$modules" >> $GITHUB_OUTPUT
dependency-license:
@@ -303,3 +301,4 @@ jobs:
./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false -D"checkstyle.skip"=true -D"scalastyle.skip"=true -D"license.skipAddThirdParty"=true --no-snapshot-updates -pl ${{needs.changes.outputs.it-modules}} -am -amd -Pno_dist
env:
MAVEN_OPTS: -Xmx2048m
+
diff --git a/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/config/YamlSeaTunnelDomConfigProcessor.java b/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/config/YamlSeaTunnelDomConfigProcessor.java
index 39ef2ce0c..5cc22bf5f 100644
--- a/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/config/YamlSeaTunnelDomConfigProcessor.java
+++ b/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/config/YamlSeaTunnelDomConfigProcessor.java
@@ -34,7 +34,6 @@ import com.hazelcast.logging.Logger;
import org.w3c.dom.Node;
public class YamlSeaTunnelDomConfigProcessor extends AbstractDomConfigProcessor {
-
private static final ILogger LOGGER = Logger.getLogger(YamlSeaTunnelDomConfigProcessor.class);
private final SeaTunnelConfig config;
diff --git a/tools/update_modules_check/update_modules_check.py b/tools/update_modules_check/update_modules_check.py
index 76a03e6ff..0e8b4f24d 100644
--- a/tools/update_modules_check/update_modules_check.py
+++ b/tools/update_modules_check/update_modules_check.py
@@ -30,7 +30,8 @@ def get_cv2_e2e_modules(files):
get_modules(files, 2, "connector-", "seatunnel-connector-v2-e2e")
def get_engine_modules(files):
- get_modules(files, 1, "seatunnel-", "seatunnel-engine")
+ # We don't run all connector e2e when engine module update
+ print(",connector-seatunnel-e2e-base,connector-console-seatunnel-e2e")
def get_engine_e2e_modules(files):
get_modules(files, 2, "connector-", "seatunnel-engine-e2e")
@@ -70,7 +71,7 @@ def get_final_modules(file):
if line.startswith("org.apache.seatunnel"):
con = line.split(":")
if con[2] == "jar":
- output = output + "," + con[1]
+ output = output + "," + ":" + con[1]
output = output[1:len(output)]
print(output)