Browse Source

[CI] [E2E] Increase e2e containers timeout (#14628)

* increase e2e containers timeout
3.2.1-prepare
xiangzihao 1 year ago committed by GitHub
parent
commit
930d2f05b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-clickhouse/docker-compose.yaml
  2. 10
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-hive/docker-compose.yaml
  3. 4
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-mysql/docker-compose.yaml
  4. 4
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-postgresql/docker-compose.yaml
  5. 4
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/datasource-sqlserver/docker-compose.yaml
  6. 4
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/file-manage/docker-compose.yaml
  7. 4
      dolphinscheduler-e2e/dolphinscheduler-e2e-core/src/main/java/org/apache/dolphinscheduler/e2e/core/DolphinSchedulerExtension.java

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

@ -30,7 +30,7 @@ services:
healthcheck: healthcheck:
test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ] test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ]
interval: 5s interval: 5s
timeout: 60s timeout: 300s
retries: 120 retries: 120
depends_on: depends_on:
clickhouse: clickhouse:
@ -54,7 +54,7 @@ services:
healthcheck: healthcheck:
test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"] test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"]
interval: 5s interval: 5s
timeout: 60s timeout: 300s
retries: 120 retries: 120
networks: networks:

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

@ -30,7 +30,7 @@ services:
healthcheck: healthcheck:
test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ] test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ]
interval: 5s interval: 5s
timeout: 60s timeout: 300s
retries: 120 retries: 120
depends_on: depends_on:
hive-server: hive-server:
@ -48,7 +48,7 @@ services:
healthcheck: healthcheck:
test: [ "CMD", "curl", "http://localhost:50070/" ] test: [ "CMD", "curl", "http://localhost:50070/" ]
interval: 5s interval: 5s
timeout: 60s timeout: 300s
retries: 120 retries: 120
datanode: datanode:
image: bde2020/hadoop-datanode:2.0.0-hadoop2.7.4-java8 image: bde2020/hadoop-datanode:2.0.0-hadoop2.7.4-java8
@ -63,7 +63,7 @@ services:
healthcheck: healthcheck:
test: [ "CMD", "curl", "http://localhost:50075" ] test: [ "CMD", "curl", "http://localhost:50075" ]
interval: 5s interval: 5s
timeout: 60s timeout: 300s
retries: 120 retries: 120
hive-server: hive-server:
image: bde2020/hive:2.3.2-postgresql-metastore image: bde2020/hive:2.3.2-postgresql-metastore
@ -84,7 +84,7 @@ services:
healthcheck: healthcheck:
test: beeline -u "jdbc:hive2://127.0.0.1:10000/default" -n health_check -e "show databases;" test: beeline -u "jdbc:hive2://127.0.0.1:10000/default" -n health_check -e "show databases;"
interval: 5s interval: 5s
timeout: 60s timeout: 300s
retries: 120 retries: 120
hive-metastore: hive-metastore:
image: bde2020/hive:2.3.2-postgresql-metastore image: bde2020/hive:2.3.2-postgresql-metastore
@ -109,7 +109,7 @@ services:
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"] test: ["CMD-SHELL", "pg_isready -U postgres"]
interval: 5s interval: 5s
timeout: 60s timeout: 300s
retries: 120 retries: 120

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

@ -33,7 +33,7 @@ services:
healthcheck: healthcheck:
test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ] test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ]
interval: 5s interval: 5s
timeout: 60s timeout: 300s
retries: 120 retries: 120
depends_on: depends_on:
mysql: mysql:
@ -51,7 +51,7 @@ services:
healthcheck: healthcheck:
test: mysqladmin ping -h 127.0.0.1 -u root --password=$$MYSQL_ROOT_PASSWORD test: mysqladmin ping -h 127.0.0.1 -u root --password=$$MYSQL_ROOT_PASSWORD
interval: 5s interval: 5s
timeout: 60s timeout: 300s
retries: 120 retries: 120
networks: networks:

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

@ -30,7 +30,7 @@ services:
healthcheck: healthcheck:
test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ] test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ]
interval: 5s interval: 5s
timeout: 60s timeout: 300s
retries: 120 retries: 120
depends_on: depends_on:
postgres: postgres:
@ -47,7 +47,7 @@ services:
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"] test: ["CMD-SHELL", "pg_isready -U postgres"]
interval: 5s interval: 5s
timeout: 60s timeout: 300s
retries: 120 retries: 120
networks: networks:

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

@ -30,7 +30,7 @@ services:
healthcheck: healthcheck:
test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ] test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ]
interval: 5s interval: 5s
timeout: 60s timeout: 300s
retries: 120 retries: 120
depends_on: depends_on:
sqlserver: sqlserver:
@ -44,7 +44,7 @@ services:
healthcheck: healthcheck:
test: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P OcP2020123 -Q "SELECT 1" test: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P OcP2020123 -Q "SELECT 1"
interval: 5s interval: 5s
timeout: 60s timeout: 300s
retries: 120 retries: 120
networks: networks:

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

@ -30,7 +30,7 @@ services:
healthcheck: healthcheck:
test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ] test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ]
interval: 5s interval: 5s
timeout: 60s timeout: 300s
retries: 120 retries: 120
volumes: volumes:
- ./common.properties:/opt/dolphinscheduler/conf/common.properties - ./common.properties:/opt/dolphinscheduler/conf/common.properties
@ -55,7 +55,7 @@ services:
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
interval: 5s interval: 5s
timeout: 120s timeout: 300s
retries: 120 retries: 120
mc: mc:
image: minio/mc:RELEASE.2022-01-07T06-01-38Z image: minio/mc:RELEASE.2022-01-07T06-01-38Z

4
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")) .withCreateContainerCmdModifier(cmd -> cmd.withUser("root"))
.withFileSystemBind(Constants.HOST_CHROME_DOWNLOAD_PATH.toFile().getAbsolutePath(), .withFileSystemBind(Constants.HOST_CHROME_DOWNLOAD_PATH.toFile().getAbsolutePath(),
Constants.SELENIUM_CONTAINER_CHROME_DOWNLOAD_PATH) Constants.SELENIUM_CONTAINER_CHROME_DOWNLOAD_PATH)
.withStartupTimeout(Duration.ofSeconds(120)); .withStartupTimeout(Duration.ofSeconds(300));
} else { } else {
browser = new BrowserWebDriverContainer<>() browser = new BrowserWebDriverContainer<>()
.withCapabilities(new ChromeOptions()) .withCapabilities(new ChromeOptions())
@ -148,7 +148,7 @@ final class DolphinSchedulerExtension implements BeforeAllCallback, AfterAllCall
.withFileSystemBind(Constants.HOST_CHROME_DOWNLOAD_PATH.toFile().getAbsolutePath(), .withFileSystemBind(Constants.HOST_CHROME_DOWNLOAD_PATH.toFile().getAbsolutePath(),
Constants.SELENIUM_CONTAINER_CHROME_DOWNLOAD_PATH) Constants.SELENIUM_CONTAINER_CHROME_DOWNLOAD_PATH)
.withRecordingMode(RECORD_ALL, record.toFile(), MP4) .withRecordingMode(RECORD_ALL, record.toFile(), MP4)
.withStartupTimeout(Duration.ofSeconds(120)); .withStartupTimeout(Duration.ofSeconds(300));
} }
} }

Loading…
Cancel
Save