Skip to content

Commit 7561969

Browse files
longjiquanlongjiquan
authored
restful server zeppelin interface (#618)
* adapt ci * trigger ci * trigger ci * trigger ci
1 parent d85dfbe commit 7561969

40 files changed

+1106
-1679
lines changed

‎ci/scripts/conda/cpu/arctern-webserver/build_arctern_webserver.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
if [ "$BUILD_ARCTERN_WEBSERVER" == '1' ]; then
6+
echo "Building arctern-webserver..."
7+
conda build conda/recipes/arctern-webserver -c defaults -c conda-forge
8+
fi

‎ci/scripts/conda/cpu/build.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ source ci/scripts/conda/cpu/arctern/build_arctern.sh
7979
logger "Build conda pkg for arctern-spark..."
8080
source ci/scripts/conda/cpu/arctern-spark/build_arctern-spark.sh
8181

82+
logger "Build conda pkg for arctern-webserver..."
83+
source ci/scripts/conda/cpu/arctern-webserver/build_arctern_webserver.sh
84+
8285
################################################################################
8386
# UPLOAD - Conda packages
8487
################################################################################

‎ci/scripts/conda/cpu/prebuild.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
export BUILD_LIBARCTERN=1
44
export BUILD_ARCTERN=1
55
export BUILD_ARCTERN_SPARK=1
6+
export BUILD_ARCTERN_WEBSERVER=1
67
export UPLOAD_LIBARCTERN=1
78
export UPLOAD_ARCTERN=1
89
export UPLOAD_ARCTERN_SPARK=1
10+
export UPLOAD_ARCTERN_WEBSERVER=1

‎ci/scripts/conda/cpu/upload_anaconda.sh‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,15 @@ if [ "$UPLOAD_ARCTERN_SPARK" == "1" ]; then
4949
echo ${ARCTERN_SPARK_FILE}
5050
anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-arctern} ${LABEL_OPTION} --force ${ARCTERN_SPARK_FILE}
5151
fi
52+
53+
54+
if [ "$UPLOAD_ARCTERN_WEBSERVER" == "1" ]; then
55+
export ARCTERN_WEBSERVER_FILE=`conda build conda/recipes/arctern-webserver -c conda-forge -c defaults --output`
56+
LABEL_OPTION="--label main"
57+
echo "LABEL_OPTION=${LABEL_OPTION}"
58+
59+
test -e ${ARCTERN_WEBSERVER_FILE}
60+
echo "Upload arctern-webserver..."
61+
echo ${ARCTERN_WEBSERVER_FILE}
62+
anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-arctern} ${LABEL_OPTION} --force ${ARCTERN_WEBSERVER_FILE}
63+
fi

‎ci/scripts/conda/cpu/upload_package.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if [ -z "$UPLOAD_PACKAGE_FILE_KEY" ]; then
77
return 0
88
fi
99

10-
if [[ "$UPLOAD_LIBARCTERN" == "1" || "$UPLOAD_ARCTERN" == "1" || "$UPLOAD_ARCTERN_SPARK" == "1" ]]; then
10+
if [[ "$UPLOAD_LIBARCTERN" == "1" || "$UPLOAD_ARCTERN" == "1" || "$UPLOAD_ARCTERN_SPARK" == "1" || "$UPLOAD_ARCTERN_WEBSERVER" == "1" ]]; then
1111
if [ -d ${CONDA_PREFIX}/conda-bld ];then
1212
tar -zcf ./conda-bld.tar.gz -C ${CONDA_PREFIX}/ conda-bld
1313
curl -u${JFROG_USENAME:-arctern}:${UPLOAD_PACKAGE_FILE_KEY} -T ./conda-bld.tar.gz ${ARTFACTORY_URL}/conda-bld.tar.gz

‎ci/scripts/conda/gpu/arctern-webserver/build_arctern_webserver.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
if [ "$BUILD_ARCTERN_WEBSERVER" == '1' ]; then
6+
echo "Building arctern-webserver..."
7+
conda build conda/recipes/arctern-webserver -c defaults -c conda-forge
8+
fi

‎ci/scripts/conda/gpu/build.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ source ci/scripts/conda/gpu/arctern/build_arctern.sh
7676
logger "Build conda pkg for arctern-spark..."
7777
source ci/scripts/conda/gpu/arctern-spark/build_arctern-spark.sh
7878

79+
logger "Build conda pkg for arctern-webserver..."
80+
source ci/scripts/conda/cpu/arctern-webserver/build_arctern_webserver.sh
81+
7982
################################################################################
8083
# UPLOAD - Conda packages
8184
################################################################################

‎ci/scripts/conda/gpu/prebuild.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ export CUDA_VERSION=${CUDA_VERSION:="10.0"}
44
export BUILD_LIBARCTERN=1
55
export BUILD_ARCTERN=1
66
export BUILD_ARCTERN_SPARK=1
7+
export BUILD_ARCTERN_WEBSERVER=1
78
export UPLOAD_LIBARCTERN=1
89
export UPLOAD_ARCTERN=1
910
export UPLOAD_ARCTERN_SPARK=1
11+
export UPLOAD_ARCTERN_WEBSERVER=1

‎ci/scripts/conda/gpu/upload_anaconda.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,14 @@ if [ "$UPLOAD_ARCTERN_SPARK" == "1" ]; then
5151
echo ${ARCTERN_SPARK_FILE}
5252
anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-arctern} ${LABEL_OPTION} --force ${ARCTERN_SPARK_FILE}
5353
fi
54+
55+
if [ "$UPLOAD_ARCTERN_WEBSERVER" == "1" ]; then
56+
export ARCTERN_WEBSERVER_FILE=`conda build conda/recipes/arctern-webserver -c conda-forge -c defaults --output`
57+
LABEL_OPTION="--label main"
58+
echo "LABEL_OPTION=${LABEL_OPTION}"
59+
60+
test -e ${ARCTERN_WEBSERVER_FILE}
61+
echo "Upload arctern-webserver..."
62+
echo ${ARCTERN_WEBSERVER_FILE}
63+
anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-arctern} ${LABEL_OPTION} --force ${ARCTERN_WEBSERVER_FILE}
64+
fi

‎ci/scripts/conda/gpu/upload_package.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if [ -z "$UPLOAD_PACKAGE_FILE_KEY" ]; then
77
return 0
88
fi
99

10-
if [[ "$UPLOAD_LIBARCTERN" == "1" || "$UPLOAD_ARCTERN" == "1" || "$UPLOAD_ARCTERN_SPARK" == "1" ]]; then
10+
if [[ "$UPLOAD_LIBARCTERN" == "1" || "$UPLOAD_ARCTERN" == "1" || "$UPLOAD_ARCTERN_SPARK" == "1" || "$UPLOAD_ARCTERN_WEBSERVER" == "1" ]]; then
1111
if [ -d ${CONDA_PREFIX}/conda-bld ];then
1212
tar -zcf ./conda-bld.tar.gz -C ${CONDA_PREFIX}/ conda-bld
1313
curl -u${JFROG_USENAME:-arctern}:${UPLOAD_PACKAGE_FILE_KEY} -T ./conda-bld.tar.gz ${ARTFACTORY_URL}/conda-bld.tar.gz

0 commit comments

Comments
 (0)