Unverified Commit 99ac146e authored by Tboy's avatar Tboy Committed by GitHub
Browse files

Merge pull request #4 from apache/dev 

merge
parents f5de6172 18e8703b

.github/workflows/ci_ut.yml

+11 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 
#



on: ["pull_request"]

env:

  DOCKER_DIR: ./docker

  LOG_DIR: /tmp/dolphinscheduler



name: Test Coveralls Parallel
@@ -35,6 +38,8 @@ jobs: 
          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

          restore-keys: |

            ${{ runner.os }}-maven-

      - name: Bootstrap database

        run: cd ${DOCKER_DIR} && docker-compose up -d db

      - name: Set up JDK 1.8

        uses: actions/setup-java@v1

        with:
@@ -44,3 +49,9 @@ jobs: 
          export MAVEN_OPTS='-Dmaven.repo.local=.m2/repository -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g'

          mvn test -Dmaven.test.skip=false cobertura:cobertura

          CODECOV_TOKEN="09c2663f-b091-4258-8a47-c981827eb29a" bash <(curl -s https://codecov.io/bash)

      - name: Collect logs

        run: |

          mkdir -p ${LOG_DIR}

          cd ${DOCKER_DIR}

          docker-compose logs db > ${LOG_DIR}/db.txt

        continue-on-error: true

docker/README.md

0 → 100644
+0 −0

Empty file added.

docker/docker-compose.yml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
version: '2'

services:

  zookeeper:

    image: zookeeper

    restart: always

    container_name: zookeeper

    ports:

      - "2181:2181"

    environment:

      ZOO_MY_ID: 1

  db:

    image: postgres

    container_name: postgres

    environment:

      - POSTGRES_USER=test

      - POSTGRES_PASSWORD=test

      - POSTGRES_DB=dolphinscheduler

    ports:

      - "5432:5432"

    volumes:

      - pgdata:/var/lib/postgresql/data

      - ./postgres/docker-entrypoint-initdb:/docker-entrypoint-initdb.d

volumes:

  pgdata:

docker/postgres/docker-entrypoint-initdb/init.sql

0 → 100755
+771 −0

File added.

Preview size limit exceeded, changes collapsed.

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ public final class Constants { 
     */

    public static final String HADOOP_PROPERTIES_PATH = "/common/hadoop/hadoop.properties";





    /**

     * common properties path

     */
@@ -1005,4 +1006,5 @@ public final class Constants { 
    public static final String CLASS = "class";

    public static final String RECEIVERS = "receivers";

    public static final String RECEIVERS_CC = "receiversCc";



}