natas_hw
/
dolphinscheduler0701
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Improvement][E2E] support e2e compose v2 fix code style (#15325) 

* support e2e compose v2 fix code stystle

* fix

* fix

* fix version

* Revert "fix version"

This reverts commit 4f1c1963

* fix version

* fix blank

---------

Co-authored-by: 80597928 <673421862@qq.com>
Co-authored-by: David Zollo <dailidong66@gmail.com>
This commit is contained in:
lizhenglei 2023-12-27 15:35:05 +08:00 committed by GitHub
parent c849501f3b
commit 74fd24b091
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dolphinscheduler-bom/pom.xml
View File

@ -119,7 +119,7 @@
<esdk-obs.version>3.23.3</esdk-obs.version> <esdk-obs.version>3.23.3</esdk-obs.version>
<system-lambda.version>1.2.1</system-lambda.version> <system-lambda.version>1.2.1</system-lambda.version>
<zeppelin-client.version>0.10.1</zeppelin-client.version> <zeppelin-client.version>0.10.1</zeppelin-client.version>
<testcontainer.version>1.17.6</testcontainer.version> <testcontainer.version>1.19.3</testcontainer.version>
<checker-qual.version>3.19.0</checker-qual.version> <checker-qual.version>3.19.0</checker-qual.version>
<zeppelin-client.version>0.10.1</zeppelin-client.version> <zeppelin-client.version>0.10.1</zeppelin-client.version>
<aliyun-voice.version>2.1.4</aliyun-voice.version> <aliyun-voice.version>2.1.4</aliyun-voice.version>

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

@ -46,7 +46,7 @@ import org.openqa.selenium.chrome.ChromeOptions;
import org.openqa.selenium.remote.RemoteWebDriver; import org.openqa.selenium.remote.RemoteWebDriver;
import org.testcontainers.Testcontainers; import org.testcontainers.Testcontainers;
import org.testcontainers.containers.BrowserWebDriverContainer; import org.testcontainers.containers.BrowserWebDriverContainer;
import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.ComposeContainer;
import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.shaded.org.awaitility.Awaitility; import org.testcontainers.shaded.org.awaitility.Awaitility;
import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.DockerImageName;
@ -67,14 +67,14 @@ final class DolphinSchedulerExtension implements BeforeAllCallback, AfterAllCall
private final int DOCKER_PORT = 12345; private final int DOCKER_PORT = 12345;
private RemoteWebDriver driver; private RemoteWebDriver driver;
private DockerComposeContainer<?> compose; private ComposeContainer compose;
private BrowserWebDriverContainer<?> browser; private BrowserWebDriverContainer<?> browser;
private HostAndPort address; private HostAndPort address;
private String rootPath; private String rootPath;
private Path record; private Path record;
private final String serviceName = "dolphinscheduler_1"; private final String serviceName = "dolphinscheduler";
@Override @Override
@SuppressWarnings("UnstableApiUsage") @SuppressWarnings("UnstableApiUsage")
@ -194,7 +194,7 @@ final class DolphinSchedulerExtension implements BeforeAllCallback, AfterAllCall
} }
} }
private DockerComposeContainer<?> createDockerCompose(ExtensionContext context) { private ComposeContainer createDockerCompose(ExtensionContext context) {
final Class<?> clazz = context.getRequiredTestClass(); final Class<?> clazz = context.getRequiredTestClass();
final DolphinScheduler annotation = clazz.getAnnotation(DolphinScheduler.class); final DolphinScheduler annotation = clazz.getAnnotation(DolphinScheduler.class);
final List<File> files = Stream.of(annotation.composeFiles()) final List<File> files = Stream.of(annotation.composeFiles())
@ -203,13 +203,17 @@ final class DolphinSchedulerExtension implements BeforeAllCallback, AfterAllCall
.map(URL::getPath) .map(URL::getPath)
.map(File::new) .map(File::new)
.collect(Collectors.toList()); .collect(Collectors.toList());
compose = new DockerComposeContainer<>(files)
.withPull(true) ComposeContainer compose = new ComposeContainer(files)
.withTailChildContainers(true) .withPull(true)
.withLocalCompose(true) .withTailChildContainers(true)
.withExposedService(serviceName, DOCKER_PORT, Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(300))) .withLocalCompose(true)
.withLogConsumer(serviceName, outputFrame -> LOGGER.info(outputFrame.getUtf8String())) .withExposedService(
.waitingFor(serviceName, Wait.forHealthcheck().withStartupTimeout(Duration.ofSeconds(300))); serviceName,
DOCKER_PORT, Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(300)))
.withLogConsumer(serviceName, outputFrame -> LOGGER.info(outputFrame.getUtf8String()))
.waitingFor(serviceName, Wait.forHealthcheck().withStartupTimeout(Duration.ofSeconds(300)));
return compose; return compose;
} }

2
dolphinscheduler-e2e/pom.xml
View File

@ -119,7 +119,7 @@
<dependency> <dependency>
<groupId>org.testcontainers</groupId> <groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId> <artifactId>testcontainers-bom</artifactId>
<version>1.18.3</version> <version>1.19.3</version>
<scope>import</scope> <scope>import</scope>
<type>pom</type> <type>pom</type>
</dependency> </dependency>