This is an automated email from the ASF dual-hosted git repository.
zihaoxiang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 930d2f05b7 [CI] [E2E] Increase e2e containers timeout (#14628)
930d2f05b7 is described below
commit 930d2f05b7e3bb198feaf99842a44f5dd409f8b6
Author: xiangzihao <[email protected]>
AuthorDate: Mon Jul 24 16:26:41 2023 +0800
[CI] [E2E] Increase e2e containers timeout (#14628)
* increase e2e containers timeout
---
.../resources/docker/datasource-clickhouse/docker-compose.yaml | 4 ++--
.../test/resources/docker/datasource-hive/docker-compose.yaml | 10 +++++-----
.../test/resources/docker/datasource-mysql/docker-compose.yaml | 4 ++--
.../resources/docker/datasource-postgresql/docker-compose.yaml | 4 ++--
.../resources/docker/datasource-sqlserver/docker-compose.yaml | 4 ++--
.../src/test/resources/docker/file-manage/docker-compose.yaml | 4 ++--
.../dolphinscheduler/e2e/core/DolphinSchedulerExtension.java | 4 ++--
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-clickhouse/docker-compose.yaml
b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-clickhouse/docker-compose.yaml
index 305ab4f3d1..12279aaf44 100644
---
a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-clickhouse/docker-compose.yaml
+++
b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-clickhouse/docker-compose.yaml
@@ -30,7 +30,7 @@ services:
healthcheck:
test: [ "CMD", "curl", "http://localhost:12345/actuator/health"; ]
interval: 5s
- timeout: 60s
+ timeout: 300s
retries: 120
depends_on:
clickhouse:
@@ -54,7 +54,7 @@ services:
healthcheck:
test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"]
interval: 5s
- timeout: 60s
+ timeout: 300s
retries: 120
networks:
diff --git
a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-hive/docker-compose.yaml
b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-hive/docker-compose.yaml
index 04113cdcfa..a976244753 100644
---
a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-hive/docker-compose.yaml
+++
b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-hive/docker-compose.yaml
@@ -30,7 +30,7 @@ services:
healthcheck:
test: [ "CMD", "curl", "http://localhost:12345/actuator/health"; ]
interval: 5s
- timeout: 60s
+ timeout: 300s
retries: 120
depends_on:
hive-server:
@@ -48,7 +48,7 @@ services:
healthcheck:
test: [ "CMD", "curl", "http://localhost:50070/"; ]
interval: 5s
- timeout: 60s
+ timeout: 300s
retries: 120
datanode:
image: bde2020/hadoop-datanode:2.0.0-hadoop2.7.4-java8
@@ -63,7 +63,7 @@ services:
healthcheck:
test: [ "CMD", "curl", "http://localhost:50075"; ]
interval: 5s
- timeout: 60s
+ timeout: 300s
retries: 120
hive-server:
image: bde2020/hive:2.3.2-postgresql-metastore
@@ -84,7 +84,7 @@ services:
healthcheck:
test: beeline -u "jdbc:hive2://127.0.0.1:10000/default" -n health_check
-e "show databases;"
interval: 5s
- timeout: 60s
+ timeout: 300s
retries: 120
hive-metastore:
image: bde2020/hive:2.3.2-postgresql-metastore
@@ -109,7 +109,7 @@ services:
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"]
interval: 5s
- timeout: 60s
+ timeout: 300s
retries: 120
diff --git
a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-mysql/docker-compose.yaml
b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-mysql/docker-compose.yaml
index 109ee61ef4..98d7bac656 100644
---
a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-mysql/docker-compose.yaml
+++
b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-mysql/docker-compose.yaml
@@ -33,7 +33,7 @@ services:
healthcheck:
test: [ "CMD", "curl", "http://localhost:12345/actuator/health"; ]
interval: 5s
- timeout: 60s
+ timeout: 300s
retries: 120
depends_on:
mysql:
@@ -51,7 +51,7 @@ services:
healthcheck:
test: mysqladmin ping -h 127.0.0.1 -u root
--password=$$MYSQL_ROOT_PASSWORD
interval: 5s
- timeout: 60s
+ timeout: 300s
retries: 120
networks:
diff --git
a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-postgresql/docker-compose.yaml
b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-postgresql/docker-compose.yaml
index df9d047a5a..c78f3e73e6 100644
---
a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-postgresql/docker-compose.yaml
+++
b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-postgresql/docker-compose.yaml
@@ -30,7 +30,7 @@ services:
healthcheck:
test: [ "CMD", "curl", "http://localhost:12345/actuator/health"; ]
interval: 5s
- timeout: 60s
+ timeout: 300s
retries: 120
depends_on:
postgres:
@@ -47,7 +47,7 @@ services:
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"]
interval: 5s
- timeout: 60s
+ timeout: 300s
retries: 120
networks:
diff --git
a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-sqlserver/docker-compose.yaml
b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-sqlserver/docker-compose.yaml
index d151292456..1a1fbc82e2 100644
---
a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-sqlserver/docker-compose.yaml
+++
b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-sqlserver/docker-compose.yaml
@@ -30,7 +30,7 @@ services:
healthcheck:
test: [ "CMD", "curl", "http://localhost:12345/actuator/health"; ]
interval: 5s
- timeout: 60s
+ timeout: 300s
retries: 120
depends_on:
sqlserver:
@@ -44,7 +44,7 @@ services:
healthcheck:
test: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P OcP2020123 -Q
"SELECT 1"
interval: 5s
- timeout: 60s
+ timeout: 300s
retries: 120
networks:
diff --git
a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/file-manage/docker-compose.yaml
b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/file-manage/docker-compose.yaml
index ff6fcd8d70..41c8b7945c 100644
---
a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/file-manage/docker-compose.yaml
+++
b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/file-manage/docker-compose.yaml
@@ -30,7 +30,7 @@ services:
healthcheck:
test: [ "CMD", "curl", "http://localhost:12345/actuator/health"; ]
interval: 5s
- timeout: 60s
+ timeout: 300s
retries: 120
volumes:
- ./common.properties:/opt/dolphinscheduler/conf/common.properties
@@ -55,7 +55,7 @@ services:
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live";]
interval: 5s
- timeout: 120s
+ timeout: 300s
retries: 120
mc:
image: minio/mc:RELEASE.2022-01-07T06-01-38Z
diff --git
a/dolphinscheduler-e2e/dolphinscheduler-e2e-core/src/main/java/org/apache/dolphinscheduler/e2e/core/DolphinSchedulerExtension.java
b/dolphinscheduler-e2e/dolphinscheduler-e2e-core/src/main/java/org/apache/dolphinscheduler/e2e/core/DolphinSchedulerExtension.java
index 45abb78374..ac0cb5117f 100644
---
a/dolphinscheduler-e2e/dolphinscheduler-e2e-core/src/main/java/org/apache/dolphinscheduler/e2e/core/DolphinSchedulerExtension.java
+++
b/dolphinscheduler-e2e/dolphinscheduler-e2e-core/src/main/java/org/apache/dolphinscheduler/e2e/core/DolphinSchedulerExtension.java
@@ -140,7 +140,7 @@ final class DolphinSchedulerExtension implements
BeforeAllCallback, AfterAllCall
.withCreateContainerCmdModifier(cmd ->
cmd.withUser("root"))
.withFileSystemBind(Constants.HOST_CHROME_DOWNLOAD_PATH.toFile().getAbsolutePath(),
Constants.SELENIUM_CONTAINER_CHROME_DOWNLOAD_PATH)
- .withStartupTimeout(Duration.ofSeconds(120));
+ .withStartupTimeout(Duration.ofSeconds(300));
} else {
browser = new BrowserWebDriverContainer<>()
.withCapabilities(new ChromeOptions())
@@ -148,7 +148,7 @@ final class DolphinSchedulerExtension implements
BeforeAllCallback, AfterAllCall
.withFileSystemBind(Constants.HOST_CHROME_DOWNLOAD_PATH.toFile().getAbsolutePath(),
Constants.SELENIUM_CONTAINER_CHROME_DOWNLOAD_PATH)
.withRecordingMode(RECORD_ALL, record.toFile(), MP4)
- .withStartupTimeout(Duration.ofSeconds(120));
+ .withStartupTimeout(Duration.ofSeconds(300));
}
}
