diff --git a/Jenkinsfile b/Jenkinsfile index 299bb33434..8dbf2d78c0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,7 +31,7 @@ pipeline { echo "Building RSS version ${VERSION} on branch ${BUILD_BRANCH}" docker login -u ${NEXUS_CREDS_USR} -p ${NEXUS_CREDS_PSW} $DOCKER_REGISTRY - ./build_distribution.sh --spark3-profile spark3 --hadoop-profile hadoop3.2 --without-dashboard + ./build_distribution.sh --spark3-profile spark3 --hadoop-profile hadoop3.2 --without-mr --without-tez --without-spark2 cd deploy/kubernetes/docker || exit ./build.sh --hadoop-version 3.2.0.15-EE-SNAPSHOT --registry $DOCKER_REGISTRY --nexus-user $NEXUS_CREDS_USR --nexus-password $NEXUS_CREDS_PSW cd ../../.. diff --git a/bin/start-coordinator.sh b/bin/start-coordinator.sh index a7211b317d..ea729616be 100755 --- a/bin/start-coordinator.sh +++ b/bin/start-coordinator.sh @@ -112,7 +112,6 @@ else fi COORDINATOR_JAVA_OPTS=${COORDINATOR_JAVA_OPTS:-""} -(nohup $RUNNER ${COORDINATOR_BASE_JVM_ARGS} ${COORDINATOR_JVM_GC_ARGS} ${JVM_LOG_ARGS} ${COORDINATOR_JAVA_OPTS} -cp ${CLASSPATH} ${MAIN_CLASS} --conf "${COORDINATOR_CONF_FILE}" $@ > ${LOG_OUT_PATH} 2>&1) & - +(nohup $RUNNER ${COORDINATOR_BASE_JVM_ARGS} ${COORDINATOR_JVM_GC_ARGS} ${JVM_LOG_ARGS} ${COORDINATOR_JAVA_OPTS} -cp ${CLASSPATH} ${MAIN_CLASS} --conf "${COORDINATOR_CONF_FILE}" $@ 2>&1 | tee -a ${LOG_OUT_PATH}) & get_pid_file_name coordinator echo $! >${RSS_PID_DIR}/${pid_file} diff --git a/bin/start-shuffle-server.sh b/bin/start-shuffle-server.sh index 0807db205b..8cc00b388a 100755 --- a/bin/start-shuffle-server.sh +++ b/bin/start-shuffle-server.sh @@ -150,7 +150,7 @@ else fi SHUFFLE_SERVER_JAVA_OPTS=${SHUFFLE_SERVER_JAVA_OPTS:-""} -(nohup $RUNNER ${SHUFFLE_SERVER_BASE_JVM_ARGS} ${SHUFFLE_SERVER_JVM_GC_ARGS} ${JVM_LOG_ARGS} ${JAVA_LIB_PATH} ${SHUFFLE_SERVER_JAVA_OPTS} -cp ${CLASSPATH} ${MAIN_CLASS} --conf "${SHUFFLE_SERVER_CONF_FILE}" $@ > ${LOG_OUT_PATH} 2>&1) & +(nohup $RUNNER ${SHUFFLE_SERVER_BASE_JVM_ARGS} ${SHUFFLE_SERVER_JVM_GC_ARGS} ${JVM_LOG_ARGS} ${JAVA_LIB_PATH} ${SHUFFLE_SERVER_JAVA_OPTS} -cp ${CLASSPATH} ${MAIN_CLASS} --conf "${SHUFFLE_SERVER_CONF_FILE}" $@ 2>&1 | tee -a ${LOG_OUT_PATH}) & get_pid_file_name shuffle-server echo $! >${RSS_PID_DIR}/${pid_file} diff --git a/build_branch.txt b/build_branch.txt index 4b52459bfe..48a7e35667 100644 --- a/build_branch.txt +++ b/build_branch.txt @@ -1 +1 @@ -branch-0.9 \ No newline at end of file +branch-0.10 \ No newline at end of file diff --git a/build_distribution.sh b/build_distribution.sh index a478ed75aa..2d6cf76941 100755 --- a/build_distribution.sh +++ b/build_distribution.sh @@ -39,7 +39,9 @@ function exit_with_usage() { echo "| [--spark3-profile ] [--spark3-mvn ] |" echo "| [--hadoop-profile ] [--without-mr] [--without-tez] |" echo "| [--without-spark] [--without-spark2] [--without-spark3] [--without-dashboard]|" - echo "| [--name ] |" + echo "| [--name ] + + |" echo "| |" echo "+------------------------------------------------------------------------------------------------------+" exit 1 diff --git a/deploy/kubernetes/docker/start.sh b/deploy/kubernetes/docker/start.sh index c2ae385844..d2da5d7a5d 100644 --- a/deploy/kubernetes/docker/start.sh +++ b/deploy/kubernetes/docker/start.sh @@ -55,3 +55,8 @@ if [ "$SERVICE_NAME" == "server" ];then fi done fi + +if [ "$SERVICE_NAME" == "dashboard" ]; then + bash ${basedir}/bin/start-dashboard.sh +fi + diff --git a/version.txt b/version.txt index f514a2f0bd..2774f8587f 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.9.1 \ No newline at end of file +0.10.0 \ No newline at end of file