Skip to content

Commit 0032ecd

Browse files
committed
fix e2e
1 parent 8617ea9 commit 0032ecd

File tree

3 files changed

+28
-14
lines changed
  • config

3 files changed

+28
-14
lines changed

config/plugins_config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ dolphinscheduler-task-dms
8484
dolphinscheduler-task-dvc
8585
dolphinscheduler-task-emr
8686
dolphinscheduler-task-flink
87+
dolphinscheduler-task-flink-materialized-table
8788
dolphinscheduler-task-flink-stream
8889
dolphinscheduler-task-hivecli
8990
dolphinscheduler-task-http

dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/flink-materialized-table/docker-compose.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ services:
2929
networks:
3030
- e2e
3131
depends_on:
32+
- jobmanager
33+
- taskmanager
3234
- flink-sql-gateway
3335
healthcheck:
34-
test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ]
36+
test: [ "CMD", "curl", "http://localhost:12345/dolphinscheduler/actuator/health" ]
3537
interval: 5s
3638
timeout: 5s
3739
retries: 120
@@ -47,7 +49,7 @@ services:
4749
FLINK_PROPERTIES=
4850
jobmanager.rpc.address: jobmanager
4951
volumes:
50-
- ./download-testfilesystem.sh:/docker/download-testfilesystem.sh:rw
52+
- ./download-testfilesystem.sh:/docker/download-testfilesystem.sh:rw,Z
5153
- ./catalog_store:/catalog_store:rw
5254

5355
taskmanager:
@@ -64,13 +66,14 @@ services:
6466
jobmanager.rpc.address: jobmanager
6567
taskmanager.numberOfTaskSlots: 2
6668
volumes:
67-
- ./download-testfilesystem.sh:/docker/download-testfilesystem.sh:rw
69+
- ./download-testfilesystem.sh:/docker/download-testfilesystem.sh:rw,Z
6870
- ./catalog_store:/catalog_store:rw
6971
flink-sql-gateway:
7072
image: flink:2.0
7173
ports:
7274
- "8083:8083"
7375
entrypoint: ['bash', '-c', '/docker/download-testfilesystem.sh && /docker-entrypoint.sh bin/sql-gateway.sh start-foreground']
76+
hostname: flink-sql-gateway
7477
networks:
7578
- e2e
7679
depends_on:
@@ -85,7 +88,7 @@ services:
8588
table.catalog-store.kind: file
8689
table.catalog-store.file.path: /catalog_store
8790
volumes:
88-
- ./download-testfilesystem.sh:/docker/download-testfilesystem.sh:rw
91+
- ./download-testfilesystem.sh:/docker/download-testfilesystem.sh:rw,Z
8992
- ./catalog_store:/catalog_store:rw
9093
networks:
9194
e2e:

dolphinscheduler-task-plugin/dolphinscheduler-task-flink-materialized-table/pom.xml

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,35 @@
2727
<packaging>jar</packaging>
2828

2929
<dependencies>
30-
<dependency>
31-
<groupId>org.apache.dolphinscheduler</groupId>
32-
<artifactId>dolphinscheduler-spi</artifactId>
33-
<scope>provided</scope>
34-
</dependency>
3530
<dependency>
3631
<groupId>org.apache.dolphinscheduler</groupId>
3732
<artifactId>dolphinscheduler-task-api</artifactId>
3833
<version>${project.version}</version>
34+
<scope>provided</scope>
3935
</dependency>
40-
<dependency>
41-
<groupId>org.apache.dolphinscheduler</groupId>
42-
<artifactId>dolphinscheduler-datasource-all</artifactId>
43-
<version>${project.version}</version>
44-
</dependency>
36+
4537
<dependency>
4638
<groupId>org.apache.dolphinscheduler</groupId>
4739
<artifactId>dolphinscheduler-common</artifactId>
4840
<version>${project.version}</version>
41+
<scope>provided</scope>
4942
</dependency>
5043
</dependencies>
44+
45+
<build>
46+
<plugins>
47+
<plugin>
48+
<groupId>org.apache.maven.plugins</groupId>
49+
<artifactId>maven-shade-plugin</artifactId>
50+
<executions>
51+
<execution>
52+
<goals>
53+
<goal>shade</goal>
54+
</goals>
55+
<phase>package</phase>
56+
</execution>
57+
</executions>
58+
</plugin>
59+
</plugins>
60+
</build>
5161
</project>

0 commit comments

Comments
 (0)