Support mutli-model test for weekly oneclick (#2204)

Signed-off-by: ZePan110 <ze.pan@intel.com>

Author: ZePan110

.github/workflows/_run-one-click.yml

@@ -69,7 +69,7 @@ jobs:
             export test_case=test_compose_faqgen_on_xeon.sh
             cd ${{ github.workspace }}/ChatQnA
           else
-            cd ${{ github.workspace }}/${{ inputs.example }}
+            cd ${{ github.workspace }}/$(echo "${{ inputs.example }}" | cut -d'-' -f1)
           fi
           export hardware=${{ inputs.hardware }}
           bash ${{ github.workspace }}/.github/workflows/scripts/docker_compose_clean_up.sh "containers"
@@ -114,24 +114,26 @@ jobs:
 
       - name: Install dependencies
         run: |
-          sudo apt update
-          sudo apt install -y python3-pip
+          # Use flock to prevent apt conflicts when multiple instances run
+          sudo flock /var/lib/dpkg/lock-frontend apt update
+          sudo flock /var/lib/dpkg/lock-frontend apt install -y python3-pip
 
       - name: get-default-params-from-config
         id: get-default-params
         if: ${{ inputs.deploy_method == 'k8s' }}
         run: |
           cd ${{ github.workspace }}
-          PARAMS_JSON=$(python3 .github/workflows/scripts/get-params.py ${{ inputs.example }})
+          example=$(echo "${{ inputs.example }}" | cut -d'-' -f1)
+          PARAMS_JSON=$(python3 .github/workflows/scripts/get-params.py $example)
           echo "LLM_model=$(echo "$PARAMS_JSON" | jq -r '.llm_model')" >> $GITHUB_ENV
-          if [ "${{ inputs.example }}" = "ChatQnA" ]; then
+          if [ "$example" = "ChatQnA" ]; then
             echo "LLM_model=$(echo "$PARAMS_JSON" | jq -r '.llm_model')" >> $GITHUB_ENV
             echo "Embedding_model=$(echo "$PARAMS_JSON" | jq -r '.embed_model')" >> $GITHUB_ENV
             echo "Reranking_model=$(echo "$PARAMS_JSON" | jq -r '.rerank_model')" >> $GITHUB_ENV
             echo "Mount_dir=$(echo "$PARAMS_JSON" | jq -r '.mount_dir')" >> $GITHUB_ENV
-          elif [ "${{ inputs.example }}" = "VisualQnA" ]; then
+          elif [ "$example" = "VisualQnA" ]; then
             echo "LVM_model=$(echo "$PARAMS_JSON" | jq -r '.lvm_model')" >> $GITHUB_ENV
-          elif [ "${{ inputs.example }}" = "AgentQnA" ]; then
+          elif [ "$example" = "AgentQnA" ]; then
             echo "LLM_model=$(echo "$PARAMS_JSON" | jq -r '.gaudi.llm_model')" >> $GITHUB_ENV
           fi
 
@@ -165,7 +167,7 @@ jobs:
           INPUT_DATA=$(
             jq -r --arg type "${{ inputs.deploy_method }}" --arg id "${{ inputs.example }}" \
               '.[$type][$id].inputs.deploy[]' ${{ github.workspace }}/.github/workflows/one-click-inputs-nobuild.json | \
-            sed "s|\$hardware|$hardware|g; \
+            sed "s|\$hardware|${{ inputs.hardware }}|g; \
                  s|\$HF_TOKEN|$HF_TOKEN|g; \
                  s|\$LLM_model|$LLM_model|g; \
                  s|\$Embedding_model|$Embedding_model|g; \

.github/workflows/manual-one-click-workflow.yml

@@ -5,20 +5,6 @@ name: One Click workflow on manual event
 
 permissions:
   contents: read
-  # actions: read
-  # checks: read
-  # deployments: read
-  # discussions: read
-  # issues: read
-  # packages: read
-  # pages: read
-  # pull-requests: read
-  # repository-projects: read
-  # statuses: read
-  # security-events: read
-  # id-token: write
-  # attestations: read
-  # models: read
 
 on:
   workflow_dispatch:
@@ -29,8 +15,8 @@ on:
         required: true
         type: string
       examples:
-        default: "ChatQnA"
-        description: 'List of examples to test [ChatQnA,CodeTrans,DocSum,CodeGen,AudioQnA,VisualQnA,FaqGen,AgentQnA]'
+        default: "ChatQnA,ChatQnA-Qwen"
+        description: 'List of examples to test [ChatQnA,ChatQnA-Qwen,CodeTrans,DocSum,CodeGen,AudioQnA,VisualQnA,FaqGen,AgentQnA]'
         required: true
         type: string
       tag:
@@ -40,7 +26,7 @@ on:
         type: string
       deploy_methods:
         default: "docker,k8s"
-        description: 'Test examples with docker compose or k8s charts'
+        description: 'Test examples with docker compose or k8s charts(exclude AgentQnA k8s on Xeon)'
         type: choice
         required: true
         options:

.github/workflows/one-click-inputs-nobuild.json

@@ -24,6 +24,30 @@
         "clear": ["1", "1", "2", "docker", "$hardware", "Y"]
       }
     },
+    "ChatQnA-Qwen": {
+      "inputs": {
+        "deploy": [
+          "1",
+          "1",
+          "1",
+          "docker",
+          "$hardware",
+          "$HF_TOKEN",
+          "$http_proxy",
+          "$https_proxy",
+          "$no_proxy",
+          "Qwen/Qwen2.5-7B-Instruct",
+          "BAAI/bge-base-en-v1.5",
+          "BAAI/bge-reranker-base",
+          "./data",
+          "N",
+          "N",
+          "y",
+          "Y"
+        ],
+        "clear": ["1", "1", "2", "docker", "$hardware", "Y"]
+      }
+    },
     "CodeTrans": {
       "inputs": {
         "deploy": [
@@ -198,6 +222,30 @@
         "clear": ["1", "1", "2", "k8s", "y", "Y"]
       }
     },
+    "ChatQnA-Qwen": {
+      "inputs": {
+        "deploy": [
+          "1",
+          "1",
+          "1",
+          "k8s",
+          "$hardware",
+          "$HF_TOKEN",
+          "$http_proxy",
+          "$https_proxy",
+          "$no_proxy",
+          "Qwen/Qwen2.5-7B-Instruct",
+          "$Embedding_model",
+          "$Reranking_model",
+          "N",
+          "N",
+          "y",
+          "8080",
+          "Y"
+        ],
+        "clear": ["1", "1", "2", "k8s", "y", "Y"]
+      }
+    },
     "CodeTrans": {
       "inputs": {
         "deploy": [

.github/workflows/weekly-one-click-test.yml

@@ -33,33 +33,22 @@ jobs:
       - name: Create Matrix
         id: get-matrix
         run: |
-          examples=$(grep -oP '^\s{4}"\K[^"]+(?=":)' ${{ github.workspace }}/one_click_deploy/core/config.py)
+          # Get examples from one-click-inputs-nobuild.json (both ChatQnA and ChatQnA-Qwen will be included)
+          examples=$(jq -r '.docker | keys[]' ${{ github.workspace }}/.github/workflows/one-click-inputs-nobuild.json)
           examples_json=$(printf '%s\n' "${examples[@]}" | sort -u | jq -R '.' | jq -sc '.')
           echo "examples=$examples_json" >> $GITHUB_OUTPUT
+
           nodes=($(echo ${NODES} | tr ',' ' '))
           nodes_json=$(printf '%s\n' "${nodes[@]}" | sort -u | jq -R '.' | jq -sc '.')
           echo "nodes=$nodes_json" >> $GITHUB_OUTPUT
+
           deploy_methods=($(echo ${DEPLOY_METHODS} | tr ',' ' '))
           deploy_methods_json=$(printf '%s\n' "${deploy_methods[@]}" | sort -u | jq -R '.' | jq -sc '.')
           echo "deploy_methods=$deploy_methods_json" >> $GITHUB_OUTPUT
 
   run-examples:
     permissions:
       contents: read
-      # id-token: write
-      # actions: read
-      # attestations: read
-      # checks: write
-      # deployments: write
-      # discussions: read
-      # issues: write
-      # models: read
-      # packages: write
-      # pages: write
-      # pull-requests: write
-      # repository-projects: read
-      # statuses: write
-      # security-events: read
     needs: [get-test-matrix]
     strategy:
       matrix: