Merge pull request #258 from xiao201208/fix/tech_solu_and_iact3

fix technical solution and iact3 action
aliyun · May 29, 2024 · 36d548f · 36d548f
2 parents 9ccc1f4 + a22bb0a
commit 36d548f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 127 deletions.
diff --git a/.github/workflows/iact3-test.yml b/.github/workflows/iact3-test.yml
@@ -59,19 +59,21 @@ jobs:
       if: ${{ steps.white-list.outputs.type == 'validate' }}
 
     - name: DingTalk Robot
+      env:
+        TITLE: ${{ github.event.pull_request.title }}
       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 }}:${{ github.event.pull_request.title }} ${{ github.event.pull_request.html_url }} "}}' ${{ secrets.DINGDING_WEBHOOK }}
+            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 }}:${{ github.event.pull_request.title }} ${{ github.event.pull_request.html_url }} "}}' ${{ secrets.DINGDING_WEBHOOK }}
+            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
         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 }}:${{ github.event.pull_request.title }} ${{ github.event.pull_request.html_url }} "}}' ${{ secrets.DINGDING_WEBHOOK }}
+            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 }}:${{ github.event.pull_request.title }} ${{ github.event.pull_request.html_url }} "}}' ${{ secrets.DINGDING_WEBHOOK }}
+            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
         fi
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
@@ -88,31 +88,6 @@ Resources:
         Ref: Vpc
       VSwitchId:
         Ref: VSwitch
-  AliyunFCServerlessDevsRole:
-    Type: ALIYUN::RAM::Role
-    Properties:
-      RoleName: AliyunFCServerlessDevsRole
-      Description: 应用中心需要您的角色中包含应用所需策略，推荐创建并使用系统默认角色 AliyunFCServerlessDevsRole。
-      AssumeRolePolicyDocument:
-        Version: '1'
-        Statement:
-        - Action: sts:AssumeRole
-          Effect: Allow
-          Principal:
-            Service:
-            - fc.aliyuncs.com
-      MaxSessionDuration: 3600
-      IgnoreExisting: true
-      DeletionForce: true
-      PolicyAttachments:
-        System:
-        - AliyunNASFullAccess
-        - AliyunFCFullAccess
-        - AliyunFCServerlessDevsRolePolicy
-        - AliyunOSSReadOnlyAccess
-        - AliyunECSReadOnlyAccess
-        - AliyunVPCReadOnlyAccess
-        - AliyunLogReadOnlyAccess
   NasAccessGroup:
     Type: ALIYUN::NAS::AccessGroup
     Properties:
@@ -139,33 +114,6 @@ Resources:
       SourceCidrIp: 0.0.0.0/0
       AccessGroupName:
         Ref: NasAccessGroup
-  FCApplication:
-    Type: ALIYUN::FC::Application
-    Properties:
-      Name:
-        Fn::Sub: fc-nas-filemgr-${ALIYUN::StackId}
-      RoleARN:
-        Fn::GetAtt:
-        - AliyunFCServerlessDevsRole
-        - Arn
-      Parameters:
-        serviceName:
-          Fn::Sub: fc-nas-filemgr-${ALIYUN::StackId}
-        functionName: filemgr
-        region:
-          Ref: ALIYUN::Region
-        vpcId:
-          Ref: Vpc
-        vswitchId:
-          Ref: VSwitch
-        securityGroupId:
-          Ref: SecurityGroup
-        mountPointsServerAddr:
-          Fn::GetAtt:
-          - NasMountTarget
-          - MountTargetDomain
-      Template: fc-nas-filemgr
-      AutoDeploy: true
   Workspace:
     Type: ALIYUN::PAI::Workspace
     DependsOn:
@@ -222,15 +170,6 @@ Metadata:
     ParameterGroups:
       - Parameters:
           - ZoneId
-        Label:
-          default:
-            en: Zone
-            zh-cn: 可用区
-      - Parameters:
           - PAIEASInstanceType
-        Label:
-          default:
-            en: PAI-EAS
-            zh-cn: PAI服务
     TemplateTags:
-      - acs:technical-solution:AI:ChatGLM和LangChain搭建对话模型-tech_solu_31
+      - acs:technical-solution:AI:ChatGLM和LangChain搭建对话模型-tech_solu_31
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
@@ -88,31 +88,6 @@ Resources:
         Ref: Vpc
       VSwitchId:
         Ref: VSwitch
-  AliyunFCServerlessDevsRole:
-    Type: ALIYUN::RAM::Role
-    Properties:
-      RoleName: AliyunFCServerlessDevsRole
-      Description: 应用中心需要您的角色中包含应用所需策略，推荐创建并使用系统默认角色 AliyunFCServerlessDevsRole。
-      AssumeRolePolicyDocument:
-        Version: '1'
-        Statement:
-        - Action: sts:AssumeRole
-          Effect: Allow
-          Principal:
-            Service:
-            - fc.aliyuncs.com
-      MaxSessionDuration: 3600
-      IgnoreExisting: true
-      DeletionForce: true
-      PolicyAttachments:
-        System:
-        - AliyunNASFullAccess
-        - AliyunFCFullAccess
-        - AliyunFCServerlessDevsRolePolicy
-        - AliyunOSSReadOnlyAccess
-        - AliyunECSReadOnlyAccess
-        - AliyunVPCReadOnlyAccess
-        - AliyunLogReadOnlyAccess
   NasAccessGroup:
     Type: ALIYUN::NAS::AccessGroup
     Properties:
@@ -139,33 +114,6 @@ Resources:
       SourceCidrIp: 0.0.0.0/0
       AccessGroupName:
         Ref: NasAccessGroup
-  FCApplication:
-    Type: ALIYUN::FC::Application
-    Properties:
-      Name:
-        Fn::Sub: fc-nas-filemgr-${ALIYUN::StackId}
-      RoleARN:
-        Fn::GetAtt:
-        - AliyunFCServerlessDevsRole
-        - Arn
-      Parameters:
-        serviceName:
-          Fn::Sub: fc-nas-filemgr-${ALIYUN::StackId}
-        functionName: filemgr
-        region:
-          Ref: ALIYUN::Region
-        vpcId:
-          Ref: Vpc
-        vswitchId:
-          Ref: VSwitch
-        securityGroupId:
-          Ref: SecurityGroup
-        mountPointsServerAddr:
-          Fn::GetAtt:
-          - NasMountTarget
-          - MountTargetDomain
-      Template: fc-nas-filemgr
-      AutoDeploy: true
   Workspace:
     Type: ALIYUN::PAI::Workspace
     DependsOn:
@@ -215,15 +163,6 @@ Metadata:
     ParameterGroups:
       - Parameters:
           - ZoneId
-        Label:
-          default:
-            en: Zone
-            zh-cn: 可用区
-      - Parameters:
           - PAIEASInstanceType
-        Label:
-          default:
-            en: PAI-EAS
-            zh-cn: PAI服务
     TemplateTags:
       - acs:technical-solution:AI:通义千问和LangChain搭建对话模型