Skip to content

Commit 930d2f0

Browse files
authored
[CI] [E2E] Increase e2e containers timeout (#14628)
* increase e2e containers timeout
1 parent 0188f40 commit 930d2f0

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-clickhouse/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030
healthcheck:
3131
test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ]
3232
interval: 5s
33-
timeout: 60s
33+
timeout: 300s
3434
retries: 120
3535
depends_on:
3636
clickhouse:
@@ -54,7 +54,7 @@ services:
5454
healthcheck:
5555
test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"]
5656
interval: 5s
57-
timeout: 60s
57+
timeout: 300s
5858
retries: 120
5959

6060
networks:

dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-hive/docker-compose.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030
healthcheck:
3131
test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ]
3232
interval: 5s
33-
timeout: 60s
33+
timeout: 300s
3434
retries: 120
3535
depends_on:
3636
hive-server:
@@ -48,7 +48,7 @@ services:
4848
healthcheck:
4949
test: [ "CMD", "curl", "http://localhost:50070/" ]
5050
interval: 5s
51-
timeout: 60s
51+
timeout: 300s
5252
retries: 120
5353
datanode:
5454
image: bde2020/hadoop-datanode:2.0.0-hadoop2.7.4-java8
@@ -63,7 +63,7 @@ services:
6363
healthcheck:
6464
test: [ "CMD", "curl", "http://localhost:50075" ]
6565
interval: 5s
66-
timeout: 60s
66+
timeout: 300s
6767
retries: 120
6868
hive-server:
6969
image: bde2020/hive:2.3.2-postgresql-metastore
@@ -84,7 +84,7 @@ services:
8484
healthcheck:
8585
test: beeline -u "jdbc:hive2://127.0.0.1:10000/default" -n health_check -e "show databases;"
8686
interval: 5s
87-
timeout: 60s
87+
timeout: 300s
8888
retries: 120
8989
hive-metastore:
9090
image: bde2020/hive:2.3.2-postgresql-metastore
@@ -109,7 +109,7 @@ services:
109109
healthcheck:
110110
test: ["CMD-SHELL", "pg_isready -U postgres"]
111111
interval: 5s
112-
timeout: 60s
112+
timeout: 300s
113113
retries: 120
114114

115115

dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-mysql/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ services:
3333
healthcheck:
3434
test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ]
3535
interval: 5s
36-
timeout: 60s
36+
timeout: 300s
3737
retries: 120
3838
depends_on:
3939
mysql:
@@ -51,7 +51,7 @@ services:
5151
healthcheck:
5252
test: mysqladmin ping -h 127.0.0.1 -u root --password=$$MYSQL_ROOT_PASSWORD
5353
interval: 5s
54-
timeout: 60s
54+
timeout: 300s
5555
retries: 120
5656

5757
networks:

dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-postgresql/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030
healthcheck:
3131
test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ]
3232
interval: 5s
33-
timeout: 60s
33+
timeout: 300s
3434
retries: 120
3535
depends_on:
3636
postgres:
@@ -47,7 +47,7 @@ services:
4747
healthcheck:
4848
test: ["CMD-SHELL", "pg_isready -U postgres"]
4949
interval: 5s
50-
timeout: 60s
50+
timeout: 300s
5151
retries: 120
5252

5353
networks:

dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-sqlserver/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030
healthcheck:
3131
test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ]
3232
interval: 5s
33-
timeout: 60s
33+
timeout: 300s
3434
retries: 120
3535
depends_on:
3636
sqlserver:
@@ -44,7 +44,7 @@ services:
4444
healthcheck:
4545
test: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P OcP2020123 -Q "SELECT 1"
4646
interval: 5s
47-
timeout: 60s
47+
timeout: 300s
4848
retries: 120
4949

5050
networks:

dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/file-manage/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030
healthcheck:
3131
test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ]
3232
interval: 5s
33-
timeout: 60s
33+
timeout: 300s
3434
retries: 120
3535
volumes:
3636
- ./common.properties:/opt/dolphinscheduler/conf/common.properties
@@ -55,7 +55,7 @@ services:
5555
healthcheck:
5656
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
5757
interval: 5s
58-
timeout: 120s
58+
timeout: 300s
5959
retries: 120
6060
mc:
6161
image: minio/mc:RELEASE.2022-01-07T06-01-38Z

dolphinscheduler-e2e/dolphinscheduler-e2e-core/src/main/java/org/apache/dolphinscheduler/e2e/core/DolphinSchedulerExtension.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,15 @@ private void setBrowserContainerByOsName() {
140140
.withCreateContainerCmdModifier(cmd -> cmd.withUser("root"))
141141
.withFileSystemBind(Constants.HOST_CHROME_DOWNLOAD_PATH.toFile().getAbsolutePath(),
142142
Constants.SELENIUM_CONTAINER_CHROME_DOWNLOAD_PATH)
143-
.withStartupTimeout(Duration.ofSeconds(120));
143+
.withStartupTimeout(Duration.ofSeconds(300));
144144
} else {
145145
browser = new BrowserWebDriverContainer<>()
146146
.withCapabilities(new ChromeOptions())
147147
.withCreateContainerCmdModifier(cmd -> cmd.withUser("root"))
148148
.withFileSystemBind(Constants.HOST_CHROME_DOWNLOAD_PATH.toFile().getAbsolutePath(),
149149
Constants.SELENIUM_CONTAINER_CHROME_DOWNLOAD_PATH)
150150
.withRecordingMode(RECORD_ALL, record.toFile(), MP4)
151-
.withStartupTimeout(Duration.ofSeconds(120));
151+
.withStartupTimeout(Duration.ofSeconds(300));
152152
}
153153
}
154154

0 commit comments

Comments
 (0)