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 bc256a18e6 [Chore] Improve ci check (#16294)
bc256a18e6 is described below
commit bc256a18e620dd164b565bb8c05356b9749b8c32
Author: xiangzihao <[email protected]>
AuthorDate: Thu Jul 11 16:55:54 2024 +0800
[Chore] Improve ci check (#16294)
* improve ci check
---
.github/workflows/api-test.yml | 4 +-
.github/workflows/backend.yml | 6 ++-
.../docker-compose-base.yaml | 2 +-
.../docker-compose-cluster.yaml | 5 +++
.../mysql_with_mysql_registry/running_test.sh | 18 ++++-----
.../docker-compose-base.yaml | 8 ++--
.../docker-compose-cluster.yaml | 5 +++
.../mysql_with_zookeeper_registry/running_test.sh | 18 ++++-----
.../docker-compose-cluster.yaml | 5 +++
.../running_test.sh | 45 +++++++++++-----------
.../docker-compose-base.yaml | 6 +--
.../docker-compose-cluster.yaml | 5 +++
.../running_test.sh | 45 +++++++++++-----------
.github/workflows/e2e.yml | 4 +-
.github/workflows/publish-docker.yaml | 2 +-
.github/workflows/unit-test.yml | 25 ++++++++----
pom.xml | 3 --
17 files changed, 118 insertions(+), 88 deletions(-)
diff --git a/.github/workflows/api-test.yml b/.github/workflows/api-test.yml
index c635b1bc8b..900dab8d7e 100644
--- a/.github/workflows/api-test.yml
+++ b/.github/workflows/api-test.yml
@@ -59,7 +59,7 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: Cache local Maven repository
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-api-test
@@ -110,7 +110,7 @@ jobs:
with:
submodules: true
- name: Cache local Maven repository
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-api-test
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index 8e83cd9792..b9e707b879 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -75,7 +75,7 @@ jobs:
uses: ./.github/actions/sanity-check
with:
token: ${{ secrets.GITHUB_TOKEN }}
- - uses: actions/cache@v3
+ - uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-backend
@@ -118,6 +118,10 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: true
+ - name: Collect Workflow Telemetry
+ uses: ./.github/actions/workflow-telemetry-action
+ with:
+ comment_on_pr: false
- uses: actions/download-artifact@v4
name: Download Binary Package
with:
diff --git
a/.github/workflows/cluster-test/mysql_with_mysql_registry/docker-compose-base.yaml
b/.github/workflows/cluster-test/mysql_with_mysql_registry/docker-compose-base.yaml
index d59e3c868c..0f5cce99d9 100644
---
a/.github/workflows/cluster-test/mysql_with_mysql_registry/docker-compose-base.yaml
+++
b/.github/workflows/cluster-test/mysql_with_mysql_registry/docker-compose-base.yaml
@@ -20,7 +20,7 @@ version: "3"
services:
mysql:
container_name: mysql
- image: mysql:5.7.36
+ image: mysql:8.0.33
command: --default-authentication-plugin=mysql_native_password
restart: always
environment:
diff --git
a/.github/workflows/cluster-test/mysql_with_mysql_registry/docker-compose-cluster.yaml
b/.github/workflows/cluster-test/mysql_with_mysql_registry/docker-compose-cluster.yaml
index 7343c8eee7..ef124fc76d 100644
---
a/.github/workflows/cluster-test/mysql_with_mysql_registry/docker-compose-cluster.yaml
+++
b/.github/workflows/cluster-test/mysql_with_mysql_registry/docker-compose-cluster.yaml
@@ -22,6 +22,11 @@ services:
container_name: ds
image: jdk8:ds_mysql_cluster
restart: always
+ volumes:
+ -
${HOME}/ds_test/master-server/logs:/root/apache-dolphinscheduler-test-SNAPSHOT-bin/master-server/logs
+ -
${HOME}/ds_test/worker-server/logs:/root/apache-dolphinscheduler-test-SNAPSHOT-bin/worker-server/logs
+ -
${HOME}/ds_test/alert-server/logs:/root/apache-dolphinscheduler-test-SNAPSHOT-bin/alert-server/logs
+ -
${HOME}/ds_test/api-server/logs:/root/apache-dolphinscheduler-test-SNAPSHOT-bin/api-server/logs
ports:
- "12345:12345"
- "5679:5679"
diff --git
a/.github/workflows/cluster-test/mysql_with_mysql_registry/running_test.sh
b/.github/workflows/cluster-test/mysql_with_mysql_registry/running_test.sh
index 7582c3ccc5..2c1e412a66 100644
--- a/.github/workflows/cluster-test/mysql_with_mysql_registry/running_test.sh
+++ b/.github/workflows/cluster-test/mysql_with_mysql_registry/running_test.sh
@@ -24,7 +24,7 @@ WORKER_HEALTHCHECK_COMMAND="curl -I -m 10 -o /dev/null -s -w
%{http_code} http:/
ALERT_HEALTHCHECK_COMMAND="curl -I -m 10 -o /dev/null -s -w %{http_code}
http://0.0.0.0:50053/actuator/health";
#Cluster start health check
-TIMEOUT=180
+TIMEOUT=300
START_HEALTHCHECK_EXITCODE=0
for ((i=1; i<=TIMEOUT; i++))
@@ -46,23 +46,23 @@ do
if [[ $i -eq $TIMEOUT ]];then
if [[ $MASTER_HTTP_STATUS -ne 200 ]];then
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/master-server/logs/dolphinscheduler-master.log"
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/master-server/logs/*.out"
+ cat ~/ds_test/master-server/logs/dolphinscheduler-master.log
+ cat ~/ds_test/master-server/logs/*.out
echo "master start health check failed"
fi
if [[ $WORKER_HTTP_STATUS -ne 200 ]]; then
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/worker-server/logs/dolphinscheduler-worker.log"
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/worker-server/logs/*.out"
+ cat ~/ds_test/worker-server/logs/dolphinscheduler-master.log
+ cat ~/ds_test/worker-server/logs/*.out
echo "worker start health check failed"
fi
if [[ $API_HTTP_STATUS -ne 200 ]]; then
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/api-server/logs/dolphinscheduler-api.log"
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/api-server/logs/*.out"
+ cat ~/ds_test/api-server/logs/dolphinscheduler-master.log
+ cat ~/ds_test/api-server/logs/*.out
echo "api start health check failed"
fi
if [[ $ALERT_HTTP_STATUS -ne 200 ]]; then
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/alert-server/logs/dolphinscheduler-alert.log"
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/alert-server/logs/*.out"
+ cat ~/ds_test/alert-server/logs/dolphinscheduler-master.log
+ cat ~/ds_test/alert-server/logs/*.out
echo "alert start health check failed"
fi
exit $START_HEALTHCHECK_EXITCODE
diff --git
a/.github/workflows/cluster-test/mysql_with_zookeeper_registry/docker-compose-base.yaml
b/.github/workflows/cluster-test/mysql_with_zookeeper_registry/docker-compose-base.yaml
index 251b72672d..7ff9de4ed6 100644
---
a/.github/workflows/cluster-test/mysql_with_zookeeper_registry/docker-compose-base.yaml
+++
b/.github/workflows/cluster-test/mysql_with_zookeeper_registry/docker-compose-base.yaml
@@ -20,7 +20,7 @@ version: "3"
services:
mysql:
container_name: mysql
- image: mysql:5.7.36
+ image: mysql:8.0.33
command: --default-authentication-plugin=mysql_native_password
restart: always
environment:
@@ -34,7 +34,7 @@ services:
retries: 120
zoo1:
- image: zookeeper:3.8.0
+ image: zookeeper:3.8
restart: always
hostname: zoo1
ports:
@@ -44,7 +44,7 @@ services:
ZOO_SERVERS: server.1=zoo1:2888:3888;2181 server.2=zoo2:2888:3888;2181
server.3=zoo3:2888:3888;2181
zoo2:
- image: zookeeper:3.8.0
+ image: zookeeper:3.8
restart: always
hostname: zoo2
ports:
@@ -54,7 +54,7 @@ services:
ZOO_SERVERS: server.1=zoo1:2888:3888;2181 server.2=zoo2:2888:3888;2181
server.3=zoo3:2888:3888;2181
zoo3:
- image: zookeeper:3.8.0
+ image: zookeeper:3.8
restart: always
hostname: zoo3
ports:
diff --git
a/.github/workflows/cluster-test/mysql_with_zookeeper_registry/docker-compose-cluster.yaml
b/.github/workflows/cluster-test/mysql_with_zookeeper_registry/docker-compose-cluster.yaml
index 7343c8eee7..ef124fc76d 100644
---
a/.github/workflows/cluster-test/mysql_with_zookeeper_registry/docker-compose-cluster.yaml
+++
b/.github/workflows/cluster-test/mysql_with_zookeeper_registry/docker-compose-cluster.yaml
@@ -22,6 +22,11 @@ services:
container_name: ds
image: jdk8:ds_mysql_cluster
restart: always
+ volumes:
+ -
${HOME}/ds_test/master-server/logs:/root/apache-dolphinscheduler-test-SNAPSHOT-bin/master-server/logs
+ -
${HOME}/ds_test/worker-server/logs:/root/apache-dolphinscheduler-test-SNAPSHOT-bin/worker-server/logs
+ -
${HOME}/ds_test/alert-server/logs:/root/apache-dolphinscheduler-test-SNAPSHOT-bin/alert-server/logs
+ -
${HOME}/ds_test/api-server/logs:/root/apache-dolphinscheduler-test-SNAPSHOT-bin/api-server/logs
ports:
- "12345:12345"
- "5679:5679"
diff --git
a/.github/workflows/cluster-test/mysql_with_zookeeper_registry/running_test.sh
b/.github/workflows/cluster-test/mysql_with_zookeeper_registry/running_test.sh
index 7582c3ccc5..2c1e412a66 100644
---
a/.github/workflows/cluster-test/mysql_with_zookeeper_registry/running_test.sh
+++
b/.github/workflows/cluster-test/mysql_with_zookeeper_registry/running_test.sh
@@ -24,7 +24,7 @@ WORKER_HEALTHCHECK_COMMAND="curl -I -m 10 -o /dev/null -s -w
%{http_code} http:/
ALERT_HEALTHCHECK_COMMAND="curl -I -m 10 -o /dev/null -s -w %{http_code}
http://0.0.0.0:50053/actuator/health";
#Cluster start health check
-TIMEOUT=180
+TIMEOUT=300
START_HEALTHCHECK_EXITCODE=0
for ((i=1; i<=TIMEOUT; i++))
@@ -46,23 +46,23 @@ do
if [[ $i -eq $TIMEOUT ]];then
if [[ $MASTER_HTTP_STATUS -ne 200 ]];then
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/master-server/logs/dolphinscheduler-master.log"
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/master-server/logs/*.out"
+ cat ~/ds_test/master-server/logs/dolphinscheduler-master.log
+ cat ~/ds_test/master-server/logs/*.out
echo "master start health check failed"
fi
if [[ $WORKER_HTTP_STATUS -ne 200 ]]; then
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/worker-server/logs/dolphinscheduler-worker.log"
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/worker-server/logs/*.out"
+ cat ~/ds_test/worker-server/logs/dolphinscheduler-master.log
+ cat ~/ds_test/worker-server/logs/*.out
echo "worker start health check failed"
fi
if [[ $API_HTTP_STATUS -ne 200 ]]; then
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/api-server/logs/dolphinscheduler-api.log"
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/api-server/logs/*.out"
+ cat ~/ds_test/api-server/logs/dolphinscheduler-master.log
+ cat ~/ds_test/api-server/logs/*.out
echo "api start health check failed"
fi
if [[ $ALERT_HTTP_STATUS -ne 200 ]]; then
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/alert-server/logs/dolphinscheduler-alert.log"
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/alert-server/logs/*.out"
+ cat ~/ds_test/alert-server/logs/dolphinscheduler-master.log
+ cat ~/ds_test/alert-server/logs/*.out
echo "alert start health check failed"
fi
exit $START_HEALTHCHECK_EXITCODE
diff --git
a/.github/workflows/cluster-test/postgresql_with_postgresql_registry/docker-compose-cluster.yaml
b/.github/workflows/cluster-test/postgresql_with_postgresql_registry/docker-compose-cluster.yaml
index 9ab79ea44d..645fa883b5 100644
---
a/.github/workflows/cluster-test/postgresql_with_postgresql_registry/docker-compose-cluster.yaml
+++
b/.github/workflows/cluster-test/postgresql_with_postgresql_registry/docker-compose-cluster.yaml
@@ -22,6 +22,11 @@ services:
container_name: ds
image: jdk8:ds_postgresql_cluster
restart: always
+ volumes:
+ -
${HOME}/ds_test/master-server/logs:/root/apache-dolphinscheduler-test-SNAPSHOT-bin/master-server/logs
+ -
${HOME}/ds_test/worker-server/logs:/root/apache-dolphinscheduler-test-SNAPSHOT-bin/worker-server/logs
+ -
${HOME}/ds_test/alert-server/logs:/root/apache-dolphinscheduler-test-SNAPSHOT-bin/alert-server/logs
+ -
${HOME}/ds_test/api-server/logs:/root/apache-dolphinscheduler-test-SNAPSHOT-bin/api-server/logs
ports:
- "12345:12345"
- "5679:5679"
diff --git
a/.github/workflows/cluster-test/postgresql_with_postgresql_registry/running_test.sh
b/.github/workflows/cluster-test/postgresql_with_postgresql_registry/running_test.sh
index 0bc861c389..2c1e412a66 100644
---
a/.github/workflows/cluster-test/postgresql_with_postgresql_registry/running_test.sh
+++
b/.github/workflows/cluster-test/postgresql_with_postgresql_registry/running_test.sh
@@ -24,7 +24,7 @@ WORKER_HEALTHCHECK_COMMAND="curl -I -m 10 -o /dev/null -s -w
%{http_code} http:/
ALERT_HEALTHCHECK_COMMAND="curl -I -m 10 -o /dev/null -s -w %{http_code}
http://0.0.0.0:50053/actuator/health";
#Cluster start health check
-TIMEOUT=180
+TIMEOUT=300
START_HEALTHCHECK_EXITCODE=0
for ((i=1; i<=TIMEOUT; i++))
@@ -45,29 +45,28 @@ do
fi
if [[ $i -eq $TIMEOUT ]];then
- if [[ $MASTER_HTTP_STATUS -ne 200 ]];then
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/master-server/logs/dolphinscheduler-master.log"
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/master-server/logs/*.out"
- echo "master start health check failed"
- fi
- if [[ $WORKER_HTTP_STATUS -ne 200 ]]; then
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/worker-server/logs/dolphinscheduler-worker.log"
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/worker-server/logs/*.out"
- echo "worker start health check failed"
- fi
- if [[ $API_HTTP_STATUS -ne 200 ]]; then
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/api-server/logs/dolphinscheduler-api.log"
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/api-server/logs/*.out"
- echo "api start health check failed"
- fi
- if [[ $ALERT_HTTP_STATUS -ne 200 ]]; then
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/alert-server/logs/dolphinscheduler-alert.log"
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/alert-server/logs/*.out"
- echo "alert start health check failed"
- fi
- exit $START_HEALTHCHECK_EXITCODE
+ if [[ $MASTER_HTTP_STATUS -ne 200 ]];then
+ cat ~/ds_test/master-server/logs/dolphinscheduler-master.log
+ cat ~/ds_test/master-server/logs/*.out
+ echo "master start health check failed"
fi
-
+ if [[ $WORKER_HTTP_STATUS -ne 200 ]]; then
+ cat ~/ds_test/worker-server/logs/dolphinscheduler-master.log
+ cat ~/ds_test/worker-server/logs/*.out
+ echo "worker start health check failed"
+ fi
+ if [[ $API_HTTP_STATUS -ne 200 ]]; then
+ cat ~/ds_test/api-server/logs/dolphinscheduler-master.log
+ cat ~/ds_test/api-server/logs/*.out
+ echo "api start health check failed"
+ fi
+ if [[ $ALERT_HTTP_STATUS -ne 200 ]]; then
+ cat ~/ds_test/alert-server/logs/dolphinscheduler-master.log
+ cat ~/ds_test/alert-server/logs/*.out
+ echo "alert start health check failed"
+ fi
+ exit $START_HEALTHCHECK_EXITCODE
+ fi
sleep 1
done
diff --git
a/.github/workflows/cluster-test/postgresql_with_zookeeper_registry/docker-compose-base.yaml
b/.github/workflows/cluster-test/postgresql_with_zookeeper_registry/docker-compose-base.yaml
index 8cc7692d71..14749ab80d 100644
---
a/.github/workflows/cluster-test/postgresql_with_zookeeper_registry/docker-compose-base.yaml
+++
b/.github/workflows/cluster-test/postgresql_with_zookeeper_registry/docker-compose-base.yaml
@@ -34,7 +34,7 @@ services:
retries: 120
zoo1:
- image: zookeeper:3.8.0
+ image: zookeeper:3.8
restart: always
hostname: zoo1
ports:
@@ -44,7 +44,7 @@ services:
ZOO_SERVERS: server.1=zoo1:2888:3888;2181 server.2=zoo2:2888:3888;2181
server.3=zoo3:2888:3888;2181
zoo2:
- image: zookeeper:3.8.0
+ image: zookeeper:3.8
restart: always
hostname: zoo2
ports:
@@ -54,7 +54,7 @@ services:
ZOO_SERVERS: server.1=zoo1:2888:3888;2181 server.2=zoo2:2888:3888;2181
server.3=zoo3:2888:3888;2181
zoo3:
- image: zookeeper:3.8.0
+ image: zookeeper:3.8
restart: always
hostname: zoo3
ports:
diff --git
a/.github/workflows/cluster-test/postgresql_with_zookeeper_registry/docker-compose-cluster.yaml
b/.github/workflows/cluster-test/postgresql_with_zookeeper_registry/docker-compose-cluster.yaml
index 9ab79ea44d..645fa883b5 100644
---
a/.github/workflows/cluster-test/postgresql_with_zookeeper_registry/docker-compose-cluster.yaml
+++
b/.github/workflows/cluster-test/postgresql_with_zookeeper_registry/docker-compose-cluster.yaml
@@ -22,6 +22,11 @@ services:
container_name: ds
image: jdk8:ds_postgresql_cluster
restart: always
+ volumes:
+ -
${HOME}/ds_test/master-server/logs:/root/apache-dolphinscheduler-test-SNAPSHOT-bin/master-server/logs
+ -
${HOME}/ds_test/worker-server/logs:/root/apache-dolphinscheduler-test-SNAPSHOT-bin/worker-server/logs
+ -
${HOME}/ds_test/alert-server/logs:/root/apache-dolphinscheduler-test-SNAPSHOT-bin/alert-server/logs
+ -
${HOME}/ds_test/api-server/logs:/root/apache-dolphinscheduler-test-SNAPSHOT-bin/api-server/logs
ports:
- "12345:12345"
- "5679:5679"
diff --git
a/.github/workflows/cluster-test/postgresql_with_zookeeper_registry/running_test.sh
b/.github/workflows/cluster-test/postgresql_with_zookeeper_registry/running_test.sh
index 0bc861c389..2c1e412a66 100644
---
a/.github/workflows/cluster-test/postgresql_with_zookeeper_registry/running_test.sh
+++
b/.github/workflows/cluster-test/postgresql_with_zookeeper_registry/running_test.sh
@@ -24,7 +24,7 @@ WORKER_HEALTHCHECK_COMMAND="curl -I -m 10 -o /dev/null -s -w
%{http_code} http:/
ALERT_HEALTHCHECK_COMMAND="curl -I -m 10 -o /dev/null -s -w %{http_code}
http://0.0.0.0:50053/actuator/health";
#Cluster start health check
-TIMEOUT=180
+TIMEOUT=300
START_HEALTHCHECK_EXITCODE=0
for ((i=1; i<=TIMEOUT; i++))
@@ -45,29 +45,28 @@ do
fi
if [[ $i -eq $TIMEOUT ]];then
- if [[ $MASTER_HTTP_STATUS -ne 200 ]];then
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/master-server/logs/dolphinscheduler-master.log"
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/master-server/logs/*.out"
- echo "master start health check failed"
- fi
- if [[ $WORKER_HTTP_STATUS -ne 200 ]]; then
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/worker-server/logs/dolphinscheduler-worker.log"
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/worker-server/logs/*.out"
- echo "worker start health check failed"
- fi
- if [[ $API_HTTP_STATUS -ne 200 ]]; then
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/api-server/logs/dolphinscheduler-api.log"
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/api-server/logs/*.out"
- echo "api start health check failed"
- fi
- if [[ $ALERT_HTTP_STATUS -ne 200 ]]; then
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/alert-server/logs/dolphinscheduler-alert.log"
- docker exec -u root ds bash -c "cat
/root/apache-dolphinscheduler-*-SNAPSHOT-bin/alert-server/logs/*.out"
- echo "alert start health check failed"
- fi
- exit $START_HEALTHCHECK_EXITCODE
+ if [[ $MASTER_HTTP_STATUS -ne 200 ]];then
+ cat ~/ds_test/master-server/logs/dolphinscheduler-master.log
+ cat ~/ds_test/master-server/logs/*.out
+ echo "master start health check failed"
fi
-
+ if [[ $WORKER_HTTP_STATUS -ne 200 ]]; then
+ cat ~/ds_test/worker-server/logs/dolphinscheduler-master.log
+ cat ~/ds_test/worker-server/logs/*.out
+ echo "worker start health check failed"
+ fi
+ if [[ $API_HTTP_STATUS -ne 200 ]]; then
+ cat ~/ds_test/api-server/logs/dolphinscheduler-master.log
+ cat ~/ds_test/api-server/logs/*.out
+ echo "api start health check failed"
+ fi
+ if [[ $ALERT_HTTP_STATUS -ne 200 ]]; then
+ cat ~/ds_test/alert-server/logs/dolphinscheduler-master.log
+ cat ~/ds_test/alert-server/logs/*.out
+ echo "alert start health check failed"
+ fi
+ exit $START_HEALTHCHECK_EXITCODE
+ fi
sleep 1
done
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 6246416c36..565187572a 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -61,7 +61,7 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: Cache local Maven repository
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-e2e
@@ -148,7 +148,7 @@ jobs:
with:
comment_on_pr: false
- name: Cache local Maven repository
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-e2e
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 859e22f25c..d00174589f 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -35,7 +35,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Cache local Maven repository
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-docker
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index ad42ee57df..e4e413d216 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -70,17 +70,29 @@ jobs:
with:
java-version: ${{ matrix.java }}
distribution: 'adopt'
- - uses: actions/cache@v3
+ - uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-unit-test
restore-keys: ${{ runner.os }}-maven-
-
- name: Run Unit tests
run: ./mvnw clean verify -B -Dmaven.test.skip=false
-Dspotless.skip=true -DskipUT=false
- name: Upload coverage report to codecov
run: CODECOV_TOKEN="09c2663f-b091-4258-8a47-c981827eb29a" bash <(curl
-s https://codecov.io/bash)
-
+ sonarcloud-analysis:
+ name: SonarCloud-Analysis
+ needs: paths-filter
+ runs-on: ubuntu-latest
+ timeout-minutes: 30
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ - uses: actions/cache@v4
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-unit-test
+ restore-keys: ${{ runner.os }}-maven-
# Set up JDK 17 for SonarCloud.
- name: Set up JDK 17
uses: actions/setup-java@v2
@@ -97,19 +109,18 @@ jobs:
-Dsonar.organization=apache
-Dsonar.core.codeCoveragePlugin=jacoco
-Dsonar.projectKey=apache-dolphinscheduler
- -Dsonar.login=e4058004bc6be89decf558ac819aa1ecbee57682
-Dsonar.exclusions=,dolphinscheduler-ui/src/**/i18n/locale/*.js,dolphinscheduler-microbench/src/**/*
+ -Dsonar.token=e4058004bc6be89decf558ac819aa1ecbee57682
-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120
-DskipUT=true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-
result:
name: Unit Test
runs-on: ubuntu-latest
timeout-minutes: 30
- needs: [ unit-test, paths-filter ]
+ needs: [ unit-test, paths-filter, sonarcloud-analysis ]
if: always()
steps:
- name: Status
@@ -118,7 +129,7 @@ jobs:
echo "Skip Unit Test!"
exit 0
fi
- if [[ ${{ needs.unit-test.result }} != 'success' ]]; then
+ if [[ ${{ needs.unit-test.result }} != 'success' || ${{
needs.sonarcloud-analysis.result }} != 'success' ]]; then
echo "Unit Test Failed!"
exit -1
fi
diff --git a/pom.xml b/pom.xml
index f5050e5ebd..47b1fdef00 100755
--- a/pom.xml
+++ b/pom.xml
@@ -642,9 +642,6 @@
<goals>
<goal>restore-instrumented-classes</goal>
</goals>
- <configuration>
- <excludes>com/github/dreamhead/moco/*</excludes>
- </configuration>
</execution>
<execution>
<id>default-report</id>
