From 5d435b1a7a64c536076732667302ae53e719d5c3 Mon Sep 17 00:00:00 2001 From: qitan Date: Mon, 24 Jun 2024 17:35:29 +0800 Subject: [PATCH] fix pai service config --- .github/workflows/iact3-test.yml | 40 ++----------------- ...e-model-based-on-ChatGLM-and-LangChain.yml | 2 +- ...ogue-model-based-on-Qwen-and-LangChain.yml | 2 +- .../solution/ai/pai-ai-painting-solution.yml | 2 +- .../micro/build-microservices-on-ack.yml | 12 +++--- 5 files changed, 13 insertions(+), 45 deletions(-) diff --git a/.github/workflows/iact3-test.yml b/.github/workflows/iact3-test.yml index 0d290a2b..9e7eb4a2 100644 --- a/.github/workflows/iact3-test.yml +++ b/.github/workflows/iact3-test.yml @@ -11,19 +11,6 @@ jobs: if: github.actor == github.event.pull_request.user.login steps: - - name: White list - id: white-list - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - white_list=($(curl -sSL -H "Authorization: token $GH_TOKEN" "https://api.github.com/repos/${{ github.repository }}/collaborators" | jq -r '.[].login')) - echo $white_list - if [[ " ${white_list[@]} " =~ " ${{ github.actor }} " ]]; then - echo "type=test" >> $GITHUB_OUTPUT - else - echo "type=validate" >> $GITHUB_OUTPUT - fi - - uses: actions/checkout@v3 id: checkout with: @@ -37,17 +24,6 @@ jobs: echo "changed_files=$(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD master) | xargs)" >> $GITHUB_OUTPUT echo $(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD master) | xargs) - - - name: Test templates - uses: aliyun/alibabacloud-ros-tool-iact3@master - with: - templates: ${{ steps.changed-templates.outputs.changed_files }} - access_key_id: ${{ secrets.TEST_ACCOUNT_KEY }} - access_key_secret: ${{ secrets.TEST_ACCOUNT_SECRET }} - type: ${{ steps.white-list.outputs.type }} - id: test-templates - if: ${{ steps.white-list.outputs.type == 'test' }} - - name: Validate templates uses: aliyun/alibabacloud-ros-tool-iact3@master with: @@ -56,7 +32,7 @@ jobs: access_key_secret: ${{ secrets.VALIDATE_ACCOUNT_SECRET }} type: ${{ steps.white-list.outputs.type }} id: validate-templates - if: ${{ steps.white-list.outputs.type == 'validate' }} + if: always() - name: DingTalk Robot env: @@ -64,16 +40,8 @@ jobs: if: always() continue-on-error: true run: | - if [[ "${{ steps.white-list.outputs.type }}" != "test" ]]; then - if [[ "${{ steps.validate-templates.outputs.status }}" = "success" ]]; then - curl -H 'Content-Type: application/json;charset=utf-8' -d '{"msgtype": "text","text": {"content": "Iact3-validate CI pass. ${{ github.event.pull_request.user.login }} PR#${{ github.event.pull_request.number }}:${TITLE} ${{ github.event.pull_request.html_url }} "}}' ${{ secrets.DINGDING_WEBHOOK }} - else - curl -H 'Content-Type: application/json;charset=utf-8' -d '{"msgtype": "text","text": {"content": "Iact3-validate CI failed. ${{ github.event.pull_request.user.login }} PR#${{ github.event.pull_request.number }}:${TITLE} ${{ github.event.pull_request.html_url }} "}}' ${{ secrets.DINGDING_WEBHOOK }} - fi + if [[ "${{ steps.validate-templates.outputs.status }}" = "success" ]]; then + curl -H 'Content-Type: application/json;charset=utf-8' -d '{"msgtype": "text","text": {"content": "Iact3-validate CI pass. ${{ github.event.pull_request.user.login }} PR#${{ github.event.pull_request.number }}:${TITLE} ${{ github.event.pull_request.html_url }} "}}' ${{ secrets.DINGDING_WEBHOOK }} else - if [[ "${{ steps.test-templates.outputs.status }}" = "success" ]]; then - curl -H 'Content-Type: application/json;charset=utf-8' -d '{"msgtype": "text","text": {"content": "Iact3-test CI pass. ${{ github.event.pull_request.user.login }} PR#${{ github.event.pull_request.number }}:${TITLE} ${{ github.event.pull_request.html_url }} "}}' ${{ secrets.DINGDING_WEBHOOK }} - else - curl -H 'Content-Type: application/json;charset=utf-8' -d '{"msgtype": "text","text": {"content": "Iact3-test CI failed. ${{ github.event.pull_request.user.login }} PR#${{ github.event.pull_request.number }}:${TITLE} ${{ github.event.pull_request.html_url }} "}}' ${{ secrets.DINGDING_WEBHOOK }} - fi + curl -H 'Content-Type: application/json;charset=utf-8' -d '{"msgtype": "text","text": {"content": "Iact3-validate CI failed. ${{ github.event.pull_request.user.login }} PR#${{ github.event.pull_request.number }}:${TITLE} ${{ github.event.pull_request.html_url }} "}}' ${{ secrets.DINGDING_WEBHOOK }} fi \ No newline at end of file diff --git a/documents/solution/ai/build-a-dialogue-model-based-on-ChatGLM-and-LangChain.yml b/documents/solution/ai/build-a-dialogue-model-based-on-ChatGLM-and-LangChain.yml index 8c884532..18811cca 100644 --- a/documents/solution/ai/build-a-dialogue-model-based-on-ChatGLM-and-LangChain.yml +++ b/documents/solution/ai/build-a-dialogue-model-based-on-ChatGLM-and-LangChain.yml @@ -133,7 +133,7 @@ Resources: name: Fn::Sub: chatglm_demo_${RandomString.value} instance: 1 - enable_webservice: true + enable_webservice: 'true' cloud: computing: instance_type: diff --git a/documents/solution/ai/build-a-dialogue-model-based-on-Qwen-and-LangChain.yml b/documents/solution/ai/build-a-dialogue-model-based-on-Qwen-and-LangChain.yml index 26fbadc4..98b4caf2 100644 --- a/documents/solution/ai/build-a-dialogue-model-based-on-Qwen-and-LangChain.yml +++ b/documents/solution/ai/build-a-dialogue-model-based-on-Qwen-and-LangChain.yml @@ -133,7 +133,7 @@ Resources: name: Fn::Sub: qwen_demo_${RandomString.value} instance: 1 - enable_webservice: true + enable_webservice: 'true' cloud: computing: instance_type: diff --git a/documents/solution/ai/pai-ai-painting-solution.yml b/documents/solution/ai/pai-ai-painting-solution.yml index 028fdadd..f4c6ebcc 100644 --- a/documents/solution/ai/pai-ai-painting-solution.yml +++ b/documents/solution/ai/pai-ai-painting-solution.yml @@ -169,7 +169,7 @@ Resources: 'Fn::Sub': 'sdwebui_${RandomString.value}' instance: 1 type: SDCluster - enable_webservice: true + enable_webservice: 'true' cloud: computing: instance_type: diff --git a/documents/solution/micro/build-microservices-on-ack.yml b/documents/solution/micro/build-microservices-on-ack.yml index dff3e67c..3ea230c4 100644 --- a/documents/solution/micro/build-microservices-on-ack.yml +++ b/documents/solution/micro/build-microservices-on-ack.yml @@ -396,16 +396,16 @@ Resources: JsonPath: $.items.[0].status.loadBalancer.ingress.[0].hostname FirstMatch: true Outputs: - TeaUrl: + UrlServiceA: Description: - zh-cn: a服务访问地址。 - en: The addresses of a service. + zh-cn: A服务访问地址。 + en: The addresses of A service. Value: 'Fn::Sub': http://${IngressInfo}/a - CoffeeUrl: + UrlServiceB: Description: - zh-cn: b服务访问地址。 - en: The addresses of b service. + zh-cn: B服务访问地址。 + en: The addresses of B service. Value: 'Fn::Sub': http://${IngressInfo}/b Metadata: