This is an automated email from the ASF dual-hosted git repository.
tyrantlucifer 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 f96868d85 [Improve][E2E] Improve CI stability (#4068)
f96868d85 is described below
commit f96868d854d9b64a71cd684d3f80ee8b395428b4
Author: Tyrantlucifer <[email protected]>
AuthorDate: Tue Feb 7 00:20:57 2023 +0800
[Improve][E2E] Improve CI stability (#4068)
* [Improve][E2E][ElasticSearch] Improve stability of es e2e test cases
* [Improve][E2E][ElasticSearch] Improve stability of es e2e test cases
* [Improve][E2E][ElasticSearch] Improve stability of es e2e test cases
---
.github/workflows/backend.yml | 24 ++++++++++++++++++++++
.../connector/elasticsearch/ElasticsearchIT.java | 7 ++++++-
tools/update_modules_check/update_modules_check.py | 1 +
3 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index 207949140..9f03fc00e 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -529,3 +529,27 @@ jobs:
./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false
-D"checkstyle.skip"=true -D"license.skipAddThirdParty"=true
--no-snapshot-updates -pl $run_it_modules -am -Pci
env:
MAVEN_OPTS: -Xmx4096m
+
+ jdbc-connectors-it:
+ needs: [ changes, sanity-check ]
+ if: needs.changes.outputs.api == 'true'
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ java: [ '8', '11' ]
+ os: [ 'ubuntu-latest' ]
+ timeout-minutes: 90
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java@v3
+ with:
+ java-version: ${{ matrix.java }}
+ distribution: 'temurin'
+ cache: 'maven'
+ - name: run some modules integration test
+ if: needs.changes.outputs.api == 'true'
+ run: |
+ ./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false
-D"checkstyle.skip"=true -D"license.skipAddThirdParty"=true
--no-snapshot-updates -pl :connector-jdbc-e2e -am -Pci
+ env:
+ MAVEN_OPTS: -Xmx4096m
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-elasticsearch-e2e/src/test/java/org/apache/seatunnel/e2e/connector/elasticsearch/ElasticsearchIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-elasticsearch-e2e/src/test/java/org/apache/seatunnel/e2e/connector/elasticsearch/ElasticsearchIT.java
index f6ed4d0f1..32b1793c2 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-elasticsearch-e2e/src/test/java/org/apache/seatunnel/e2e/connector/elasticsearch/ElasticsearchIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-elasticsearch-e2e/src/test/java/org/apache/seatunnel/e2e/connector/elasticsearch/ElasticsearchIT.java
@@ -36,12 +36,14 @@ import org.junit.jupiter.api.TestTemplate;
import org.testcontainers.containers.Container;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.elasticsearch.ElasticsearchContainer;
+import org.testcontainers.lifecycle.Startables;
import org.testcontainers.utility.DockerImageName;
import org.testcontainers.utility.DockerLoggerFactory;
import java.io.IOException;
import java.math.BigDecimal;
import java.net.UnknownHostException;
+import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
@@ -53,6 +55,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
@Slf4j
public class ElasticsearchIT extends TestSuiteBase implements TestResource {
@@ -71,8 +74,10 @@ public class ElasticsearchIT extends TestSuiteBase
implements TestResource {
.withEnv("cluster.routing.allocation.disk.threshold_enabled",
"false")
.withNetworkAliases("elasticsearch")
.withPassword("elasticsearch")
+ .withStartupAttempts(5)
+ .withStartupTimeout(Duration.ofMinutes(5))
.withLogConsumer(new
Slf4jLogConsumer(DockerLoggerFactory.getLogger("elasticsearch:8.0.0")));
- container.start();
+ Startables.deepStart(Stream.of(container)).join();
log.info("Elasticsearch container started");
esRestClient = EsRestClient.createInstance(
Lists.newArrayList("https://"; + container.getHttpHostAddress()),
diff --git a/tools/update_modules_check/update_modules_check.py
b/tools/update_modules_check/update_modules_check.py
index 8a8a990a1..4c21578a2 100644
--- a/tools/update_modules_check/update_modules_check.py
+++ b/tools/update_modules_check/update_modules_check.py
@@ -150,6 +150,7 @@ def get_deleted_modules(files):
def get_sub_it_modules(modules, total_num, current_num):
modules_arr = modules.split(",")
+ modules_arr.remove("connector-jdbc-e2e")
output = ""
for i,module in enumerate(modules_arr):
if len(module) > 0 and i % int(total_num) == int(current_num):
