This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch 1.3.1-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.1-release by this push:
new 32b0dfd update ci from dev-1.3.0 (#3100)
32b0dfd is described below
commit 32b0dfd471bac1c51440ea6050fa0019ade17a20
Author: lgcareer <[email protected]>
AuthorDate: Tue Jun 30 19:10:05 2020 +0800
update ci from dev-1.3.0 (#3100)
---
.github/workflows/ci_e2e.yml | 13 ++++++-------
.github/workflows/ci_ut.yml | 10 ++++++----
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/ci_e2e.yml b/.github/workflows/ci_e2e.yml
index 265b0aa..82c81ef 100644
--- a/.github/workflows/ci_e2e.yml
+++ b/.github/workflows/ci_e2e.yml
@@ -44,15 +44,14 @@ jobs:
${{ runner.os }}-maven-
- name: Build Image
run: |
- export VERSION=`cat $(pwd)/pom.xml| grep "SNAPSHOT</version>" | awk
-F "-SNAPSHOT" '{print $1}' | awk -F ">" '{print $2}'`
- sh ./dockerfile/hooks/build
+ sh ./docker/build/hooks/build
- name: Docker Run
run: |
- VERSION=`cat $(pwd)/pom.xml| grep "SNAPSHOT</version>" | awk -F
"-SNAPSHOT" '{print $1}' | awk -F ">" '{print $2}'`
- mkdir -p /tmp/logs
- docker run -dit -e POSTGRESQL_USERNAME=test -e
POSTGRESQL_PASSWORD=test -v /tmp/logs:/opt/dolphinscheduler/logs -p 8888:8888
dolphinscheduler:$VERSION all
+ export VERSION=$(cat $(pwd)/pom.xml | grep '<version>' -m 1 | awk
'{print $1}' | sed 's/<version>//' | sed 's/<\/version>//')
+ sed -i
"s/apache\/dolphinscheduler:latest/apache\/dolphinscheduler:${VERSION}/g"
$(pwd)/docker/docker-swarm/docker-compose.yml
+ docker-compose -f $(pwd)/docker/docker-swarm/docker-compose.yml up -d
- name: Check Server Status
- run: sh ./dockerfile/hooks/check
+ run: sh $(pwd)/docker/docker-swarm/check
- name: Prepare e2e env
run: |
sudo apt-get install -y libxss1 libappindicator1 libindicator7 xvfb
unzip libgbm1
@@ -70,6 +69,6 @@ jobs:
uses: actions/upload-artifact@v1
with:
name: dslogs
- path: /tmp/logs
+ path:
/var/lib/docker/volumes/docker-swarm_dolphinscheduler-logs/_data
diff --git a/.github/workflows/ci_ut.yml b/.github/workflows/ci_ut.yml
index 75f6408..7ab6966 100644
--- a/.github/workflows/ci_ut.yml
+++ b/.github/workflows/ci_ut.yml
@@ -21,7 +21,6 @@ on:
branches:
- dev
env:
- DOCKER_DIR: ./docker
LOG_DIR: /tmp/dolphinscheduler
name: Unit Test
@@ -47,7 +46,11 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- name: Bootstrap database
- run: cd ${DOCKER_DIR} && docker-compose up -d
+ run: |
+ sed -i "s/: root/: test/g"
$(pwd)/docker/docker-swarm/docker-compose.yml
+ docker-compose -f $(pwd)/docker/docker-swarm/docker-compose.yml
create --force-recreate dolphinscheduler-zookeeper dolphinscheduler-postgresql
+ sudo cp $(pwd)/sql/dolphinscheduler-postgre.sql $(docker volume
inspect docker-swarm_dolphinscheduler-postgresql-initdb | grep "Mountpoint" |
awk -F "\"" '{print $4}')
+ docker-compose -f $(pwd)/docker/docker-swarm/docker-compose.yml up
-d dolphinscheduler-zookeeper dolphinscheduler-postgresql
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
@@ -82,6 +85,5 @@ jobs:
- name: Collect logs
run: |
mkdir -p ${LOG_DIR}
- cd ${DOCKER_DIR}
- docker-compose logs db > ${LOG_DIR}/db.txt
+ docker-compose -f $(pwd)/docker/docker-swarm/docker-compose.yml logs
dolphinscheduler-postgresql > ${LOG_DIR}/db.txt
continue-on-error: true
