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/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new d679d0c885 [Improve][CI] Always run all module unit test (#5800)
d679d0c885 is described below
commit d679d0c885573c4ecc95c9395ac92b83f5bdc717
Author: Jia Fan <[email protected]>
AuthorDate: Wed Nov 8 14:42:02 2023 +0800
[Improve][CI] Always run all module unit test (#5800)
---
.github/workflows/backend.yml | 32 +++++++++++++++-------
.../seatunnel/engine/e2e/k8s/KubernetesIT.java | 4 +--
2 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index 48b659974c..afd708972a 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -282,19 +282,11 @@ jobs:
distribution: 'temurin'
cache: 'maven'
- name: run all modules unit test
- if: needs.changes.outputs.api == 'true'
run: |
./mvnw -B -T 1 clean verify -D"maven.test.skip"=false
-D"license.skipAddThirdParty"=true --no-snapshot-updates
env:
MAVEN_OPTS: -Xmx4096m
- - name: run updated modules unit test
- if: needs.changes.outputs.api == 'false' &&
needs.changes.outputs.ut-modules != ''
- run: |
- ./mvnw -B -T 1 clean verify -D"maven.test.skip"=false
-D"license.skipAddThirdParty"=true --no-snapshot-updates -pl
${{needs.changes.outputs.ut-modules}} -am -Pci
- env:
- MAVEN_OPTS: -Xmx4096m
-
updated-modules-integration-test-part-1:
needs: [ changes, sanity-check ]
if: needs.changes.outputs.api == 'false' &&
needs.changes.outputs.it-modules != ''
@@ -316,7 +308,13 @@ jobs:
if: needs.changes.outputs.api == 'false' &&
needs.changes.outputs.it-modules != ''
run: |
sub_modules=`python
tools/update_modules_check/update_modules_check.py sub_update_it_module
${{needs.changes.outputs.it-modules}} 7 0`
- ./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false
-D"license.skipAddThirdParty"=true --no-snapshot-updates -pl $sub_modules -am
-Pci
+ sub_modules=${sub_modules//,:seatunnel-engine-k8s-e2e/}
+ sub_modules=${sub_modules//:seatunnel-engine-k8s-e2e/}
+ if [ ! -z $sub_modules ]; then
+ ./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false
-D"license.skipAddThirdParty"=true --no-snapshot-updates -pl $sub_modules -am
-Pci
+ else
+ echo "sub modules is empty, skipping"
+ fi
env:
MAVEN_OPTS: -Xmx2048m
@@ -341,6 +339,8 @@ jobs:
if: needs.changes.outputs.api == 'false' &&
needs.changes.outputs.it-modules != ''
run: |
sub_modules=`python
tools/update_modules_check/update_modules_check.py sub_update_it_module
${{needs.changes.outputs.it-modules}} 8 1`
+ sub_modules=${sub_modules//,:seatunnel-engine-k8s-e2e/}
+ sub_modules=${sub_modules//:seatunnel-engine-k8s-e2e/}
if [ ! -z $sub_modules ]; then
./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false
-D"license.skipAddThirdParty"=true --no-snapshot-updates -pl $sub_modules -am
-Pci
else
@@ -370,6 +370,8 @@ jobs:
if: needs.changes.outputs.api == 'false' &&
needs.changes.outputs.it-modules != ''
run: |
sub_modules=`python
tools/update_modules_check/update_modules_check.py sub_update_it_module
${{needs.changes.outputs.it-modules}} 8 2`
+ sub_modules=${sub_modules//,:seatunnel-engine-k8s-e2e/}
+ sub_modules=${sub_modules//:seatunnel-engine-k8s-e2e/}
if [ ! -z $sub_modules ]; then
./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false
-D"license.skipAddThirdParty"=true --no-snapshot-updates -pl $sub_modules -am
-Pci
else
@@ -399,6 +401,8 @@ jobs:
if: needs.changes.outputs.api == 'false' &&
needs.changes.outputs.it-modules != ''
run: |
sub_modules=`python
tools/update_modules_check/update_modules_check.py sub_update_it_module
${{needs.changes.outputs.it-modules}} 8 3`
+ sub_modules=${sub_modules//,:seatunnel-engine-k8s-e2e/}
+ sub_modules=${sub_modules//:seatunnel-engine-k8s-e2e/}
if [ ! -z $sub_modules ]; then
./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false
-D"license.skipAddThirdParty"=true --no-snapshot-updates -pl $sub_modules -am
-Pci
else
@@ -427,6 +431,8 @@ jobs:
if: needs.changes.outputs.api == 'false' &&
needs.changes.outputs.it-modules != ''
run: |
sub_modules=`python
tools/update_modules_check/update_modules_check.py sub_update_it_module
${{needs.changes.outputs.it-modules}} 8 4`
+ sub_modules=${sub_modules//,:seatunnel-engine-k8s-e2e/}
+ sub_modules=${sub_modules//:seatunnel-engine-k8s-e2e/}
if [ ! -z $sub_modules ]; then
./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false
-D"license.skipAddThirdParty"=true --no-snapshot-updates -pl $sub_modules -am
-Pci
else
@@ -455,6 +461,8 @@ jobs:
if: needs.changes.outputs.api == 'false' &&
needs.changes.outputs.it-modules != ''
run: |
sub_modules=`python
tools/update_modules_check/update_modules_check.py sub_update_it_module
${{needs.changes.outputs.it-modules}} 8 5`
+ sub_modules=${sub_modules//,:seatunnel-engine-k8s-e2e/}
+ sub_modules=${sub_modules//:seatunnel-engine-k8s-e2e/}
if [ ! -z $sub_modules ]; then
./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false
-D"license.skipAddThirdParty"=true --no-snapshot-updates -pl $sub_modules -am
-Pci
else
@@ -483,6 +491,8 @@ jobs:
if: needs.changes.outputs.api == 'false' &&
needs.changes.outputs.it-modules != ''
run: |
sub_modules=`python
tools/update_modules_check/update_modules_check.py sub_update_it_module
${{needs.changes.outputs.it-modules}} 8 6`
+ sub_modules=${sub_modules//,:seatunnel-engine-k8s-e2e/}
+ sub_modules=${sub_modules//:seatunnel-engine-k8s-e2e/}
if [ ! -z $sub_modules ]; then
./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false
-D"license.skipAddThirdParty"=true --no-snapshot-updates -pl $sub_modules -am
-Pci
else
@@ -512,6 +522,8 @@ jobs:
if: needs.changes.outputs.api == 'false' &&
needs.changes.outputs.it-modules != ''
run: |
sub_modules=`python
tools/update_modules_check/update_modules_check.py sub_update_it_module
${{needs.changes.outputs.it-modules}} 8 7`
+ sub_modules=${sub_modules//,:seatunnel-engine-k8s-e2e/}
+ sub_modules=${sub_modules//:seatunnel-engine-k8s-e2e/}
if [ ! -z $sub_modules ]; then
./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false
-D"license.skipAddThirdParty"=true --no-snapshot-updates -pl $sub_modules -am
-Pci
else
@@ -545,7 +557,7 @@ jobs:
MAVEN_OPTS: -Xmx4096m
engine-k8s-it:
needs: [ changes, sanity-check ]
- if: needs.changes.outputs.api == 'true'
+ if: needs.changes.outputs.api == 'true' ||
contains(needs.changes.outputs.it-modules, 'seatunnel-engine-k8s-e2e')
runs-on: ${{ matrix.os }}
strategy:
matrix:
diff --git
a/seatunnel-e2e/seatunnel-engine-e2e/seatunnel-engine-k8s-e2e/src/test/java/org/apache/seatunnel/engine/e2e/k8s/KubernetesIT.java
b/seatunnel-e2e/seatunnel-engine-e2e/seatunnel-engine-k8s-e2e/src/test/java/org/apache/seatunnel/engine/e2e/k8s/KubernetesIT.java
index 4e50f3ec20..808de6c043 100644
---
a/seatunnel-e2e/seatunnel-engine-e2e/seatunnel-engine-k8s-e2e/src/test/java/org/apache/seatunnel/engine/e2e/k8s/KubernetesIT.java
+++
b/seatunnel-e2e/seatunnel-engine-e2e/seatunnel-engine-k8s-e2e/src/test/java/org/apache/seatunnel/engine/e2e/k8s/KubernetesIT.java
@@ -110,14 +110,14 @@ public class KubernetesIT {
appsV1Api.createNamespacedStatefulSet(
namespace, yamlStatefulSet, null, null, null, null);
Awaitility.await()
- .atMost(60, TimeUnit.SECONDS)
+ .atMost(120, TimeUnit.SECONDS)
.untilAsserted(
() -> {
V1StatefulSet v1StatefulSet =
appsV1Api.readNamespacedStatefulSet(
stsName, namespace, null);
Assertions.assertEquals(
-
v1StatefulSet.getStatus().getReadyReplicas(), 2);
+ 2,
v1StatefulSet.getStatus().getReadyReplicas());
});
// submit job
String command =
