You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2023/05/31 11:44:38 UTC

[linkis] branch dev-1.4.0-integration-test2 updated: adjust cli shell

This is an automated email from the ASF dual-hosted git repository.

casion pushed a commit to branch dev-1.4.0-integration-test2
in repository https://gitbox.apache.org/repos/asf/linkis.git


The following commit(s) were added to refs/heads/dev-1.4.0-integration-test2 by this push:
     new 9b31fd9fb adjust cli shell
9b31fd9fb is described below

commit 9b31fd9fb994cf1ec3403465aa041243b3ea0014
Author: casionone <ca...@gmail.com>
AuthorDate: Wed May 31 19:44:21 2023 +0800

    adjust cli shell
---
 .github/workflows/integration-test.yml | 48 +++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 5994433ff..32f5ebc95 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -100,16 +100,16 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
-      - name: Build frontend by node.js
-        run: |
-          cd linkis-web
-          sed -i "/VUE_APP_MN_CONFIG_PREFIX/d" .env
-          npm install
-          npm run build
-
-      - name: Build backend by maven
-        run: |
-          ./mvnw install -Pdocker -Dmysql.connector.scope=compile -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -Dlinkis.build.web=true -Dlinkis.build.ldh=true
+#      - name: Build frontend by node.js
+#        run: |
+#          cd linkis-web
+#          sed -i "/VUE_APP_MN_CONFIG_PREFIX/d" .env
+#          npm install
+#          npm run build
+#
+#      - name: Build backend by maven
+#        run: |
+#          ./mvnw install -Pdocker -Dmysql.connector.scope=compile -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -Dlinkis.build.web=true -Dlinkis.build.ldh=true
 
       - name: Set up chart-testing
         uses: ./.github/actions/chart-testing-action
@@ -124,9 +124,21 @@ jobs:
 
       - name: Start Linkis Service
         run: |
-          docker tag linkis:${{ env.LINKIS_VERSION }}     linkis:dev
-          docker tag linkis-web:${{ env.LINKIS_VERSION }} linkis-web:dev
-          docker tag linkis-ldh:${{ env.LINKIS_VERSION }} linkis-ldh:dev
+          #docker tag linkis:${{ env.LINKIS_VERSION }}     linkis:dev
+          #docker tag linkis-web:${{ env.LINKIS_VERSION }} linkis-web:dev
+          #docker tag linkis-ldh:${{ env.LINKIS_VERSION }} linkis-ldh:dev
+
+          #先直接下载镜像 后续调整为主动构建
+           ROOT_DIR=./linkis-dist/
+           MIRRORS="ghcr.io"
+           TAG="dev"
+           docker pull ${MIRRORS}/apache/linkis/linkis-ldh:${TAG}
+           docker pull ${MIRRORS}/apache/linkis/linkis:${TAG}
+           docker pull ${MIRRORS}/apache/linkis/linkis-web:${TAG}
+          #重新打tag
+           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
           #查看镜像
           docker image ls
           bash ./linkis-dist/helm/scripts/install-mysql.sh  true\
@@ -154,7 +166,13 @@ jobs:
           # 查看proxy 端口映射
           bash ./linkis-dist/helm/scripts/remote-proxy.sh list
           # 执行shell测试
-          bash ./linkis-dist/target/apache-linkis-${{ env.LINKIS_VERSION }}-bin/linkis-package/bin/linkis-cli --gatewayUrl http://127.0.0.1:19001 -engineType shell-1 -codeType shell -code "echo "hello" "
+          #bash ./linkis-dist/target/apache-linkis-${{ env.LINKIS_VERSION }}-bin/linkis-package/bin/linkis-cli --gatewayUrl http://127.0.0.1:19001 -engineType shell-1 -codeType shell -code "echo \"hello\" " -submitUser hadoop -proxyUser hadoop
+          bash ./linkis-dist/linkis-package/bin/linkis-cli --gatewayUrl http://127.0.0.1:19001 -engineType shell-1 -codeType shell -code "echo \"hello\" " -submitUser hadoop -proxyUser hadoop
+
           #执行python测试
-          bash ./linkis-dist/target/apache-linkis-${{ env.LINKIS_VERSION }}-bin/linkis-package/bin/linkis-cli --gatewayUrl http://127.0.0.1:19001 -engineType python-python2 -codeType python -code "print(\"hello\")"
+          #bash ./linkis-dist/target/apache-linkis-${{ env.LINKIS_VERSION }}-bin/linkis-package/bin/linkis-cli --gatewayUrl http://127.0.0.1:19001 -engineType python-python2 -codeType python -code "print(\"hello\")" -submitUser hadoop -proxyUser hadoop
+          bash ./linkis-dist/linkis-package/bin/linkis-cli --gatewayUrl http://127.0.0.1:19001 -engineType python-python2 -codeType python -code "print(\"hello\")" -submitUser hadoop -proxyUser hadoop
+
+
+
         shell: bash
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org