Skip to content

Commit 3631167

Browse files
committed
[HWORKS-1755] Build with dashboard
1 parent 9a13cb2 commit 3631167

7 files changed

+13
-7
lines changed

Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pipeline {
3131
echo "Building RSS version ${VERSION} on branch ${BUILD_BRANCH}"
3232
docker login -u ${NEXUS_CREDS_USR} -p ${NEXUS_CREDS_PSW} $DOCKER_REGISTRY
3333
34-
./build_distribution.sh --spark3-profile spark3 --hadoop-profile hadoop3.2 --without-dashboard
34+
./build_distribution.sh --spark3-profile spark3 --hadoop-profile hadoop3.2 --without-mr --without-tez --without-spark2
3535
cd deploy/kubernetes/docker || exit
3636
./build.sh --hadoop-version 3.2.0.15-EE-SNAPSHOT --registry $DOCKER_REGISTRY --nexus-user $NEXUS_CREDS_USR --nexus-password $NEXUS_CREDS_PSW
3737
cd ../../..

bin/start-coordinator.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ else
112112
fi
113113

114114
COORDINATOR_JAVA_OPTS=${COORDINATOR_JAVA_OPTS:-""}
115-
(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) &
116-
115+
(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}) &
117116
get_pid_file_name coordinator
118117
echo $! >${RSS_PID_DIR}/${pid_file}

bin/start-shuffle-server.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ else
150150
fi
151151

152152
SHUFFLE_SERVER_JAVA_OPTS=${SHUFFLE_SERVER_JAVA_OPTS:-""}
153-
(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) &
153+
(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}) &
154154

155155
get_pid_file_name shuffle-server
156156
echo $! >${RSS_PID_DIR}/${pid_file}

build_branch.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
branch-0.9
1+
branch-0.10

build_distribution.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ function exit_with_usage() {
3939
echo "| [--spark3-profile <spark3 profile id>] [--spark3-mvn <custom maven options>] |"
4040
echo "| [--hadoop-profile <hadoop profile id>] [--without-mr] [--without-tez] |"
4141
echo "| [--without-spark] [--without-spark2] [--without-spark3] [--without-dashboard]|"
42-
echo "| [--name <custom name>] |"
42+
echo "| [--name <custom name> ]
43+
44+
|"
4345
echo "| <maven build options> |"
4446
echo "+------------------------------------------------------------------------------------------------------+"
4547
exit 1

deploy/kubernetes/docker/start.sh

+5
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,8 @@ if [ "$SERVICE_NAME" == "server" ];then
5555
fi
5656
done
5757
fi
58+
59+
if [ "$SERVICE_NAME" == "dashboard" ]; then
60+
bash ${basedir}/bin/start-dashboard.sh
61+
fi
62+

version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.9.1
1+
0.10.0

0 commit comments

Comments
 (0)