Merge from branch 1.3.3-release

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,17 +1,19 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
-labels: ''
+title: "[BUG] bug title "
+labels: bug
 assignees: ''
 
 ---
 
+*For better global communication, please give priority to using English description, thx! *
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 
 **To Reproduce**
-Steps to reproduce the behavior:
+Steps to reproduce the behavior, for example:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -23,5 +25,12 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
+
+**Which version of Dolphin Scheduler:**
+ -[1.1.0-preview]
+
 **Additional context**
 Add any other context about the problem here.
+
+**Requirement or improvement
+- Please describe about your requirements or improvement suggestions.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,8 +1,8 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: ''
-labels: ''
+title: "[Feature]"
+labels: new feature
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,23 @@
+---
+name: question
+about: have a question wanted to be help
+title: "[QUESTION] question title"
+labels: question
+assignees: ''
+
+---
+
+*For better global communication, please give priority to using English description, thx! *
+
+**Describe the question**
+A clear and concise description of what the question is.
+
+
+**Which version of DolphinScheduler:**
+ -[1.1.0-preview]
+
+**Additional context**
+Add any other context about the problem here.
+
+**Requirement or improvement
+- Please describe about your requirements or improvement suggestions.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,32 @@
+## *Tips*
+- *Thanks very much for contributing to Apache DolphinScheduler.*
+- *Please review https://dolphinscheduler.apache.org/en-us/community/index.html before opening a pull request.*
+
+## What is the purpose of the pull request
+
+*(For example: This pull request adds checkstyle plugin.)*
+
+## Brief change log
+
+*(for example:)*
+ - *Add maven-checkstyle-plugin to root pom.xml*
+
+## Verify this pull request
+
+*(Please pick either of the following options)*
+
+This pull request is code cleanup without any test coverage.
+
+*(or)*
+
+This pull request is already covered by existing tests, such as *(please describe tests)*.
+
+(or)
+
+This change added tests and can be verified as follows:
+
+*(example:)*
+
+ - *Added dolphinscheduler-dao tests for end-to-end.*
+ - *Added CronUtilsTest to verify the change.*
+ - *Manually verified the change by testing locally.*

.github/workflows/ci_backend.yml

@@ -0,0 +1,64 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: Backend
+
+on:
+ push:
+ paths:
+ - '.github/workflows/ci_backend.yml'
+ - 'package.xml'
+ - 'pom.xml'
+ - 'dolphinscheduler-alert/**'
+ - 'dolphinscheduler-api/**'
+ - 'dolphinscheduler-common/**'
+ - 'dolphinscheduler-dao/**'
+ - 'dolphinscheduler-rpc/**'
+ - 'dolphinscheduler-server/**'
+ pull_request:
+ paths:
+ - '.github/workflows/ci_backend.yml'
+ - 'package.xml'
+ - 'pom.xml'
+ - 'dolphinscheduler-alert/**'
+ - 'dolphinscheduler-api/**'
+ - 'dolphinscheduler-common/**'
+ - 'dolphinscheduler-dao/**'
+ - 'dolphinscheduler-rpc/**'
+ - 'dolphinscheduler-server/**'
+
+jobs:
+ Compile-check:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ # In the checkout@v2, it doesn't support git submodule. Execute the commands manually.
+ - name: checkout submodules
+ shell: bash
+ run: |
+ git submodule sync --recursive
+ git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ - name: Set up JDK 1.8
+ uses: actions/setup-java@v1
+ with:
+ java-version: 1.8
+ - name: Check license
+ run: ./mvnw -B apache-rat:check
+ - name: Compile
+ run: mvn -B clean compile install -Prelease -Dmaven.test.skip=true
+ - name: Check dependency license
+ run: tools/dependencies/check-LICENSE.sh

.github/workflows/ci_e2e.yml

@@ -0,0 +1,74 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+on: ["pull_request"]
+env:
+ DOCKER_DIR: ./docker
+ LOG_DIR: /tmp/dolphinscheduler
+
+name: e2e Test
+
+jobs:
+
+ build:
+ name: Test
+ runs-on: ubuntu-latest
+ steps:
+
+ - uses: actions/checkout@v2
+ # In the checkout@v2, it doesn't support git submodule. Execute the commands manually.
+ - name: checkout submodules
+ shell: bash
+ run: |
+ git submodule sync --recursive
+ git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ - uses: actions/cache@v1
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-maven-
+ - name: Build Image
+ run: |
+ sh ./docker/build/hooks/build
+ - name: Docker Run
+ run: |
+ 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 $(pwd)/docker/docker-swarm/check
+ - name: Prepare e2e env
+ run: |
+ sudo apt-get install -y libxss1 libappindicator1 libindicator7 xvfb unzip libgbm1
+ wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+ sudo dpkg -i google-chrome*.deb
+ sudo apt-get install -f -y
+ google-chrome -version
+ googleVersion=$(curl -s https://chromedriver.storage.googleapis.com/LATEST_RELEASE)
+ wget -N https://chromedriver.storage.googleapis.com/${googleVersion}/chromedriver_linux64.zip
+ unzip chromedriver_linux64.zip
+ sudo mv -f chromedriver /usr/local/share/chromedriver
+ sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver
+ - name: Run e2e Test
+ run: cd ./e2e && mvn -B clean test
+ - name: Collect logs
+ if: failure()
+ uses: actions/upload-artifact@v2
+ with:
+ name: dslogs
+ path: ${{ github.workspace }}/docker/docker-swarm/dolphinscheduler-logs

.github/workflows/ci_frontend.yml

@@ -0,0 +1,71 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: Frontend
+
+on:
+ push:
+ paths:
+ - '.github/workflows/ci_frontend.yml'
+ - 'dolphinscheduler-ui/**'
+ pull_request:
+ paths:
+ - '.github/workflows/ci_frontend.yml'
+ - 'dolphinscheduler-ui/**'
+
+jobs:
+ Compile-check:
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ os: [ubuntu-latest, macos-latest]
+ steps:
+ - uses: actions/checkout@v2
+ # In the checkout@v2, it doesn't support git submodule. Execute the commands manually.
+ - name: checkout submodules
+ shell: bash
+ run: |
+ git submodule sync --recursive
+ git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ - name: Set up Node.js
+ uses: actions/setup-node@v1
+ with:
+ version: 8
+ - name: Compile
+ run: |
+ cd dolphinscheduler-ui
+ npm install node-sass --unsafe-perm
+ npm install
+ npm run lint
+ npm run build
+
+ License-check:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ # In the checkout@v2, it doesn't support git submodule. Execute the commands manually.
+ - name: checkout submodules
+ shell: bash
+ run: |
+ git submodule sync --recursive
+ git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ - name: Set up JDK 1.8
+ uses: actions/setup-java@v1
+ with:
+ java-version: 1.8
+ - name: Check
+ run: mvn -B apache-rat:check