This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.4.0-integration-test
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.4.0-integration-test by
this push:
new 1dd522dfa update
1dd522dfa is described below
commit 1dd522dfab43b04f7f07e4ad248ca035131805cb
Author: casionone <[email protected]>
AuthorDate: Sun May 28 00:25:37 2023 +0800
update
---
.github/workflows/integration-test.yml | 17 ++++++++++++++++-
linkis-dist/helm/scripts/install-ldh.sh | 4 ++--
linkis-dist/helm/scripts/install-linkis.sh | 26 ++++++++++++++++----------
3 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/integration-test.yml
b/.github/workflows/integration-test.yml
index b29af1435..51be146fc 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -113,8 +113,23 @@ jobs:
- name: Install Shell
run: |
+ ROOT_DIR=./linkis-dist/
+ MIRRORS="ghcr.io"
+ TAG="latest"
- sh -v ./linkis-dist/bin/install-linkis-to-kubernetes.sh
pull-install -l
+ docker tag ${MIRRORS}/apache/linkis/linkis:${TAG} linkis:dev
+ docker tag ${MIRRORS}/apache/linkis/linkis-web:${TAG} linkis-web:dev
+
+ docker tag ${MIRRORS}/apache/linkis/linkis-ldh:${TAG} linkis-ldh:dev
+ ${ROOT_DIR}/docker/scripts/make-linikis-image-with-mysql-jdbc.sh
+ docker tag linkis:with-jdbc linkis:dev
+
+ sh ./linkis-dist/helm/scripts/create-kind-cluster.sh \
+ && sh ./linkis-dist/helm/scripts/install-mysql.sh \
+ && sh ./linkis-dist/helm/scripts/install-ldh.sh \
+ && sh ./linkis-dist/helm/scripts/install-charts-with-ldh.sh
+
+# sh -v ./linkis-dist/bin/install-linkis-to-kubernetes.sh
pull-install -l
n=0
while (($n<10))
diff --git a/linkis-dist/helm/scripts/install-ldh.sh
b/linkis-dist/helm/scripts/install-ldh.sh
index bb8292dfe..7be4d3486 100755
--- a/linkis-dist/helm/scripts/install-ldh.sh
+++ b/linkis-dist/helm/scripts/install-ldh.sh
@@ -26,7 +26,7 @@ LDH_VERSION=${LDH_VERSION-${LINKIS_IMAGE_TAG}}
echo "# LDH version: ${LINKIS_IMAGE_TAG}"
# load image
-if [ "${USING_KIND}" == "true" ]; then
+if [ "X${USING_KIND}" == "Xtrue" ]; then
echo "# Loading LDH image ..."
kind load docker-image linkis-ldh:${LINKIS_IMAGE_TAG} --name
${KIND_CLUSTER_NAME}
fi
@@ -36,7 +36,7 @@ echo "# Deploying LDH ..."
set +e
x=`kubectl get ns ldh 2> /dev/null`
set -e
-if [ "${x}" == "" ]; then
+if [ "X${x}" == "X" ]; then
kubectl create ns ldh
fi
kubectl apply -n ldh -f ${RESOURCE_DIR}/ldh/configmaps
diff --git a/linkis-dist/helm/scripts/install-linkis.sh
b/linkis-dist/helm/scripts/install-linkis.sh
index 0c0e10f27..2abf12a0d 100755
--- a/linkis-dist/helm/scripts/install-linkis.sh
+++ b/linkis-dist/helm/scripts/install-linkis.sh
@@ -24,18 +24,24 @@ HELM_RELEASE_NAME=${2:-linkis-demo}
LOCAL_MODE=${3:-true}
USING_KIND=${4:-false}
+if [ "X${HELM_DEBUG}" == "Xtrue" ]; then
+ # template helm charts
+ helm template --namespace ${KUBE_NAMESPACE} -f
${LINKIS_CHART_DIR}/values.yaml ${HELM_RELEASE_NAME} ${LINKIS_CHART_DIR}
+else
# create hadoop configs
-
+ if [ "X${WITH_LDH}" == "Xtrue" ]; then
kubectl apply -n ${KUBE_NAMESPACE} -f ${RESOURCE_DIR}/ldh/configmaps
-
+ fi
+ # load image
+ if [ "X${USING_KIND}" == "Xtrue" ]; then
echo "# Loading Linkis image ..."
kind load docker-image linkis:${LINKIS_IMAGE_TAG} --name
${KIND_CLUSTER_NAME}
kind load docker-image linkis-web:${LINKIS_IMAGE_TAG} --name
${KIND_CLUSTER_NAME}
-
- # install helm charts
- echo "# Installing linkis, image tag=${LINKIS_IMAGE_TAG},local
mode=${LOCAL_MODE} ..."
- helm install --create-namespace --namespace ${KUBE_NAMESPACE} \
- -f ${LINKIS_CHART_DIR}/values.yaml \
- --set
image.tag=${LINKIS_IMAGE_TAG},linkis.featureGates.localMode=${LOCAL_MODE} \
- ${HELM_RELEASE_NAME} ${LINKIS_CHART_DIR}
-
+ fi
+ # install helm charts
+ echo "# Installing linkis, image tag=${LINKIS_IMAGE_TAG},local
mode=${LOCAL_MODE} ..."
+ helm install --create-namespace --namespace ${KUBE_NAMESPACE} \
+ -f ${LINKIS_CHART_DIR}/values.yaml \
+ --set
image.tag=${LINKIS_IMAGE_TAG},linkis.featureGates.localMode=${LOCAL_MODE} \
+ ${HELM_RELEASE_NAME} ${LINKIS_CHART_DIR}
+fi
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
