Refactor folder to support different vendors (#743)

Signed-off-by: Xinyao Wang <xinyao.wang@intel.com>
Signed-off-by: chensuyue <suyue.chen@intel.com>

.github/workflows/_example-workflow.yml

@@ -46,13 +46,25 @@ jobs:
       - name: Clean Up Working Directory
         run: sudo rm -rf ${{github.workspace}}/*
 
+      - name: Get checkout ref
+        run: |
+          if [ "${{ github.event_name }}" == "pull_request" ] || [ "${{ github.event_name }}" == "pull_request_target" ]; then
+            echo "CHECKOUT_REF=refs/pull/${{ github.event.number }}/merge" >> $GITHUB_ENV
+          else
+            echo "CHECKOUT_REF=${{ github.ref }}" >> $GITHUB_ENV
+          fi
+          echo "checkout ref ${{ env.CHECKOUT_REF }}"
+
       - name: Checkout out Repo
         uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+          fetch-depth: 0
 
       - name: Clone required Repo
         run: |
-          cd ${{ github.workspace }}/${{ inputs.example }}/docker
-          docker_compose_path=${{ github.workspace }}/${{ inputs.example }}/docker/docker_build_compose.yaml
+          cd ${{ github.workspace }}/${{ inputs.example }}/docker_image_build
+          docker_compose_path=${{ github.workspace }}/${{ inputs.example }}/docker_image_build/build.yaml
           if [[ $(grep -c "tei-gaudi:" ${docker_compose_path}) != 0 ]]; then
               git clone https://github.com/huggingface/tei-gaudi.git
           fi
@@ -66,8 +78,8 @@ jobs:
         if: ${{ fromJSON(inputs.build) }}
         uses: opea-project/validation/actions/image-build@main
         with:
-          work_dir: ${{ github.workspace }}/${{ inputs.example }}/docker
-          docker_compose_path: ${{ github.workspace }}/${{ inputs.example }}/docker/docker_build_compose.yaml
+          work_dir: ${{ github.workspace }}/${{ inputs.example }}/docker_image_build
+          docker_compose_path: ${{ github.workspace }}/${{ inputs.example }}/docker_image_build/build.yaml
           registry: ${OPEA_IMAGE_REPO}opea
           tag: ${{ inputs.tag }}
 

.github/workflows/_get-image-list.yml

@@ -37,7 +37,7 @@ jobs:
               examples=($(echo ${{ inputs.examples }} | tr ',' ' '))
               for example in ${examples[@]}
               do
-                  images=$(cat ${{ github.workspace }}/${example}/docker/docker_build_compose.yaml | yq -r '.[]' | jq 'keys' | jq -c '.')
+                  images=$(cat ${{ github.workspace }}/${example}/docker_image_build/build.yaml | yq -r '.[]' | jq 'keys' | jq -c '.')
                   image_list=$(echo ${image_list} | jq -s '.[0] + .[1] | unique' - <(echo ${images}))
               done
           fi

.github/workflows/_get-test-matrix.yml

@@ -11,14 +11,10 @@ on:
         required: false
         type: string
         default: '.github|README.md|*.txt'
-      xeon_server_label:
+      test_mode:
         required: false
         type: string
-        default: 'xeon'
-      gaudi_server_label:
-        required: false
-        type: string
-        default: 'gaudi'
+        default: 'docker_compose'
     outputs:
       run_matrix:
         description: "The matrix string"
@@ -49,10 +45,9 @@ jobs:
       - name: Get test matrix
         id: get-test-matrix
         run: |
-          set -xe
           if [ "${{ github.event_name }}" == "pull_request" ] || [ "${{ github.event_name }}" == "pull_request_target" ]; then
             LATEST_COMMIT_SHA=$(curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-            "https://api.github.com/repos/opea-project/GenAIExamples/commits?sha=main" | jq -r '.[0].sha')
+            "https://api.github.com/repos/opea-project/GenAIExamples/commits?sha=${{ github.event.pull_request.base.ref }}" | jq -r '.[0].sha')
             echo "Latest commit SHA is $LATEST_COMMIT_SHA"
             base_commit=$LATEST_COMMIT_SHA
           else
@@ -61,20 +56,8 @@ jobs:
           merged_commit=$(git log -1 --format='%H')
           changed_files="$(git diff --name-only ${base_commit} ${merged_commit} | \
           grep -vE '${{ inputs.diff_excluded_files }}')" || true
-          examples=$(printf '%s\n' "${changed_files[@]}" | grep '/' | cut -d'/' -f1 | sort -u)
-          run_matrix="{\"include\":["
-          for example in ${examples}; do
-              run_hardware=""
-              if [ $(printf '%s\n' "${changed_files[@]}" | grep ${example} | grep -c gaudi) != 0 ]; then run_hardware="gaudi"; fi
-              if [ $(printf '%s\n' "${changed_files[@]}" | grep ${example} | grep -c xeon) != 0 ]; then run_hardware="xeon ${run_hardware}"; fi
-              if [ "$run_hardware" == "" ]; then run_hardware="xeon gaudi"; fi
-              for hw in ${run_hardware}; do
-                  if [ "$hw" == "gaudi" ] && [ "${{ inputs.gaudi_server_label }}" != "" ]; then
-                    run_matrix="${run_matrix}{\"example\":\"${example}\",\"hardware\":\"${{ inputs.gaudi_server_label }}\"},"
-                  elif [ "${{ inputs.xeon_server_label }}" != "" ]; then
-                    run_matrix="${run_matrix}{\"example\":\"${example}\",\"hardware\":\"${{ inputs.xeon_server_label }}\"},"
-                  fi
-              done
-          done
-          run_matrix=$run_matrix"]}"
-          echo "run_matrix=${run_matrix}" >> $GITHUB_OUTPUT
+          echo "changed_files=$changed_files"
+          export changed_files=$changed_files
+          export test_mode=${{ inputs.test_mode }}
+          export WORKSPACE=${{ github.workspace }}
+          bash .github/workflows/scripts/get_test_matrix.sh

.github/workflows/_image-build.yml

@@ -1,69 +0,0 @@
-# Copyright (C) 2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-name: Image Build
-permissions: read-all
-on:
-  workflow_call:
-    inputs:
-      image_repo:
-        required: false
-        type: string
-      image_tag:
-        required: true
-        type: string
-      mega_service:
-        required: true
-        type: string
-      runner_label:
-        required: false
-        type: string
-        default: 'docker-build-xeon'
-    outputs:
-      image_repo:
-        description: "The image repository used for the image build"
-        value: ${{ jobs.mega-image-build.outputs.image_repo }}
-      image_tag:
-        description: "The image tag used for the image build"
-        value: ${{ jobs.mega-image-build.outputs.image_tag }}
-
-jobs:
-  mega-image-build:
-    runs-on: ${{ inputs.runner_label }}
-    outputs:
-      image_repo: ${{ steps.build-megaservice-image.outputs.image_repo }}
-      image_tag: ${{ steps.build-megaservice-image.outputs.image_tag }}
-    steps:
-      - name: Clean up Working Directory
-        run: |
-          sudo rm -rf ${{github.workspace}}/* || true
-
-      - name: Get checkout ref
-        run: |
-          if [ "${{ github.event_name }}" == "pull_request" ] || [ "${{ github.event_name }}" == "pull_request_target" ]; then
-            echo "CHECKOUT_REF=refs/pull/${{ github.event.number }}/merge" >> $GITHUB_ENV
-          else
-            echo "CHECKOUT_REF=${{ github.ref }}" >> $GITHUB_ENV
-          fi
-          echo "checkout ref ${{ env.CHECKOUT_REF }}"
-
-      - name: Checkout out Repo
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-          fetch-depth: 0
-
-      - name: Building MegaService Docker Image
-        id: build-megaservice-image
-        env:
-          IMAGE_REPO: ${{ inputs.image_repo }}
-          IMAGE_TAG: ${{ inputs.image_tag }}
-          MEGA_SERVICE: ${{ inputs.mega_service }}
-        run: |
-          .github/workflows/scripts/build_push.sh ${{ env.MEGA_SERVICE}}
-          if [ -z "${{ env.IMAGE_REPO }}" ]; then
-            IMAGE_REPO=$OPEA_IMAGE_REPO
-          fi
-          echo "IMAGE_TAG=${IMAGE_TAG}"
-          echo "image_tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
-          echo "image_repo=${IMAGE_REPO}" >> $GITHUB_OUTPUT

.github/workflows/_run-docker-compose.yml

@@ -24,6 +24,10 @@ on:
         description: Hardware to run the test on
         required: true
         type: string
+      diff_excluded_files:
+        required: false
+        type: string
+        default: ""
 jobs:
   get-test-case:
     runs-on: ubuntu-latest
@@ -52,10 +56,37 @@ jobs:
         shell: bash
         id: test-case-matrix
         run: |
-          set -x
           example_l=$(echo ${{ inputs.example }} | tr '[:upper:]' '[:lower:]')
           cd ${{ github.workspace }}/${{ inputs.example }}/tests
-          test_cases=$(find . -type f -name "test_${example_l}*on_${{ inputs.hardware }}.sh" -print | cut -d/ -f2 | jq -R '.' | jq -sc '.')
+          run_test_cases=""
+
+          default_test_case=$(find . -type f -name "test_compose_on_${{ inputs.hardware }}.sh" | cut -d/ -f2)
+          if [ "$default_test_case" ]; then run_test_cases="$default_test_case"; fi
+          other_test_cases=$(find . -type f -name "test_compose_*_on_${{ inputs.hardware }}.sh" | cut -d/ -f2)
+          echo "default_test_case=$default_test_case"
+          echo "other_test_cases=$other_test_cases"
+
+          if [ "${{ inputs.tag }}" == "ci" ]; then
+              base_commit=$(curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+              "https://api.github.com/repos/opea-project/GenAIExamples/commits?sha=${{ github.event.pull_request.base.ref }}" | jq -r '.[0].sha')
+              merged_commit=$(git log -1 --format='%H')
+              changed_files="$(git diff --name-only ${base_commit} ${merged_commit} | grep -vE '${{ inputs.diff_excluded_files }}')" || true
+          fi
+
+          for test_case in $other_test_cases; do
+              if [ "${{ inputs.tag }}" == "ci" ]; then
+                  flag=${test_case%_on_*}
+                  flag=${flag#test_compose_}
+                  if [[ $(printf '%s\n' "${changed_files[@]}" | grep ${{ inputs.example }} | grep ${flag}) ]]; then
+                      run_test_cases="$run_test_cases $test_case"
+                  fi
+              else
+                  run_test_cases="$run_test_cases $test_case"
+              fi
+          done
+
+          test_cases=$(echo $run_test_cases | tr ' ' '\n' | sort -u | jq -R '.' | jq -sc '.')
+          echo "test_cases=$test_cases"
           echo "test_cases=$test_cases" >> $GITHUB_OUTPUT
 
   run-test:
@@ -101,11 +132,13 @@ jobs:
         shell: bash
         if: cancelled() || failure()
         run: |
-          cd ${{ github.workspace }}/${{ inputs.example }}/docker/${{ inputs.hardware }}
-          yaml_files=$(find . -type f -name "*compose*yaml")
-          for file in $yaml_files; do
-              docker compose -f ${file} stop && docker compose -f ${file} rm -f || true
-          done
+          cd ${{ github.workspace }}/${{ inputs.example }}/docker_compose
+          test_case=${{ matrix.test_case }}
+          flag=${test_case%_on_*}
+          flag=${flag#test_}
+          yaml_file=$(find . -type f -wholename "*${{ inputs.hardware }}/${flag}.yaml")
+          echo $yaml_file
+          docker compose -f $yaml_file stop && docker compose -f $yaml_file rm -f || true
           docker system prune -f
           docker rmi $(docker images --filter reference="*:5000/*/*" -q) || true
 
@@ -113,5 +146,5 @@ jobs:
         if: ${{ !cancelled() }}
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.test_case }}
+          name: ${{ inputs.example }}_${{ matrix.test_case }}
           path: ${{ github.workspace }}/${{ inputs.example }}/tests/*.log

.github/workflows/chatqna_benchmark.yml

@@ -1,78 +0,0 @@
-# Copyright (C) 2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-name: benchmark test with chatqna_benchmark
-
-on:
-  # pull_request:
-  #   branches: [main]
-  #   types: [opened, reopened, ready_for_review, synchronize]
-  #   # inputs:
-  #   #   variables:
-  #   #     hardware:
-  #   #       description: 'Enter your param' #gaudi or xeon
-  #   #       required: true
-  #   #       default: xeon
-  schedule:
-    - cron: "35 0 * * 6"
-  workflow_dispatch:
-    inputs:
-      hardware:
-        description: 'Enter your hardware' #gaudi or xeon
-        required: true
-        default: gaudi
-
-jobs:
-  Example-test:
-    runs-on: ${{ github.event.inputs.hardware || 'gaudi' }} #xeon    #gaudi
-    steps:
-      - name: Clean Up Working Directory
-        run: sudo rm -rf ${{github.workspace}}/*
-
-      - name: Checkout out Repo
-        uses: actions/checkout@v4
-
-      - name: Clone repo GenAIEval
-        run: |
-          git clone https://github.com/opea-project/GenAIEval.git
-          cd GenAIEval && git checkout v0.6
-
-      - name: Run test
-        env:
-          HUGGINGFACEHUB_API_TOKEN: ${{ secrets.HUGGINGFACEHUB_API_TOKEN }}
-          GOOGLE_CSE_ID: ${{ secrets.GOOGLE_CSE_ID }}
-          GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
-          hardware: ${{ github.event.inputs.hardware || 'gaudi' }}  #xeon
-          mode: perf
-          IMAGE_TAG: latest
-          IMAGE_REPO_GAUDI: ${{ vars.IMAGE_REPO_GAUDI }}
-          IMAGE_REPO_XEON: ${{ vars.IMAGE_REPO_XEON }}
-        run: |
-          # cd ${{ github.workspace }}/$example/tests
-          cd ${{ github.workspace }}/ChatQnA/tests
-          cp ../../GenAIEval/evals/benchmark/chatqna_benchmark.py .
-          cp ../../GenAIEval/evals/benchmark/data.json ${{ github.workspace }}/ChatQnA/docker/${hardware}/
-
-          if [ "$hardware" == "gaudi" ]; then IMAGE_REPO=$IMAGE_REPO_GAUDI; else IMAGE_REPO=$IMAGE_REPO_XEON; fi
-          export IMAGE_REPO=${IMAGE_REPO}
-          # example_l=$(echo $example | tr '[:upper:]' '[:lower:]')
-          if [ -f test_chatqna_on_${hardware}.sh ]; then timeout 30m bash test_chatqna_on_${hardware}.sh > ${hardware}_output.log; else echo "Test script not found, skip test!"; fi
-
-      - name: Process log and save to JSON
-        env:
-          hardware: ${{ github.event.inputs.hardware || 'gaudi' }}   #xeon
-        run: |
-          cd ${{ github.workspace }}/ChatQnA/tests
-          echo '{}' > ${hardware}_output.json
-          echo $(grep -a 'Total Requests:' ${hardware}_output.log | awk '{print "{\"total_requests\": \""$3 "\"}"}') > ${hardware}_output.json
-          echo $(grep -a 'P50 latency is' ${hardware}_output.log | awk '{print "{\"p50_latency\": \""$4 "\"}"}') >> ${hardware}_output.json
-          echo $(grep -a 'P99 latency is' ${hardware}_output.log | awk '{print "{\"p99_latency\": \""$4 "\"}"}') >> ${hardware}_output.json
-          jq -s 'add' ${hardware}_output.json > ${hardware}_final_output.json && mv ${hardware}_final_output.json ${hardware}_output.json
-
-      - name: Publish pipeline artifact
-        if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
-        with:
-          path: |
-            ${{ github.workspace }}/ChatQnA/tests/*.log
-            ${{ github.workspace }}/ChatQnA/tests/*.json

.github/workflows/docker/compose/AudioQnA-compose.yaml

@@ -1,10 +0,0 @@
-# Copyright (C) 2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-# this file should be run in the root of the repo
-services:
-  audioqna:
-    build:
-      context: docker
-      dockerfile: ./Dockerfile
-    image: ${REGISTRY:-opea}/audioqna:${TAG:-latest}

.github/workflows/docker/compose/ChatQnA-compose.yaml

@@ -1,20 +0,0 @@
-# Copyright (C) 2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-# this file should be run in the root of the repo
-services:
-  chatqna:
-    build:
-      context: docker
-      dockerfile: ./Dockerfile
-    image: ${REGISTRY:-opea}/chatqna:${TAG:-latest}
-  chatqna-ui:
-    build:
-      context: docker/ui
-      dockerfile: ./docker/Dockerfile
-    image: ${REGISTRY:-opea}/chatqna-ui:${TAG:-latest}
-  chatqna-conversation-ui:
-    build:
-      context: docker/ui
-      dockerfile: ./docker/Dockerfile.react
-    image: ${REGISTRY:-opea}/chatqna-conversation-ui:${TAG:-latest}

.github/workflows/docker/compose/CodeGen-compose.yaml

@@ -1,20 +0,0 @@
-# Copyright (C) 2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-# this file should be run in the root of the repo
-services:
-  codegen:
-    build:
-      context: docker
-      dockerfile: ./Dockerfile
-    image: ${REGISTRY:-opea}/codegen:${TAG:-latest}
-  codegen-ui:
-    build:
-      context: docker/ui
-      dockerfile: ./docker/Dockerfile
-    image: ${REGISTRY:-opea}/codegen-ui:${TAG:-latest}
-  codegen-react-ui:
-    build:
-      context: docker/ui
-      dockerfile: ./docker/Dockerfile.react
-    image: ${REGISTRY:-opea}/codegen-conversation-ui:${TAG:-latest}

.github/workflows/docker/compose/CodeTrans-compose.yaml

@@ -1,15 +0,0 @@
-# Copyright (C) 2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-# this file should be run in the root of the repo
-services:
-  codetrans:
-    build:
-      context: docker
-      dockerfile: ./Dockerfile
-    image: ${REGISTRY:-opea}/codetrans:${TAG:-latest}
-  codetrans-ui:
-    build:
-      context: docker/ui
-      dockerfile: ./docker/Dockerfile
-    image: ${REGISTRY:-opea}/codetrans-ui:${TAG:-latest}

.github/workflows/docker/compose/DocSum-compose.yaml

@@ -1,20 +0,0 @@
-# Copyright (C) 2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-# this file should be run in the root of the repo
-services:
-  docsum:
-    build:
-      context: docker
-      dockerfile: ./Dockerfile
-    image: ${REGISTRY:-opea}/docsum:${TAG:-latest}
-  docsum-ui:
-    build:
-      context: docker/ui
-      dockerfile: ./docker/Dockerfile
-    image: ${REGISTRY:-opea}/docsum-ui:${TAG:-latest}
-  docsum-react-ui:
-    build:
-      context: docker/ui
-      dockerfile: ./docker/Dockerfile.react
-    image: ${REGISTRY:-opea}/docsum-react-ui:${TAG:-latest}

.github/workflows/docker/compose/FaqGen-compose.yaml

@@ -1,20 +0,0 @@
-# Copyright (C) 2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-# this file should be run in the root of the repo
-services:
-  faqgen:
-    build:
-      context: docker
-      dockerfile: ./Dockerfile
-    image: ${REGISTRY:-opea}/faqgen:${TAG:-latest}
-  faqgen-ui:
-    build:
-      context: docker/ui
-      dockerfile: ./docker/Dockerfile
-    image: ${REGISTRY:-opea}/faqgen-ui:${TAG:-latest}
-  faqgen-react-ui:
-    build:
-      context: docker/ui
-      dockerfile: ./docker/Dockerfile.react
-    image: ${REGISTRY:-opea}/faqgen-react-ui:${TAG:-latest}

.github/workflows/docker/compose/SearchQnA-compose.yaml

@@ -1,15 +0,0 @@
-# Copyright (C) 2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-# this file should be run in the root of the repo
-services:
-  searchqna:
-    build:
-      context: docker
-      dockerfile: ./Dockerfile
-    image: ${REGISTRY:-opea}/searchqna:${TAG:-latest}
-  searchqna-ui:
-    build:
-      context: docker/ui
-      dockerfile: ./docker/Dockerfile
-    image: ${REGISTRY:-opea}/searchqna-ui:${TAG:-latest}

.github/workflows/docker/compose/Translation-compose.yaml

@@ -1,15 +0,0 @@
-# Copyright (C) 2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-# this file should be run in the root of the repo
-services:
-  translation:
-    build:
-      context: docker
-      dockerfile: ./Dockerfile
-    image: ${REGISTRY:-opea}/translation:${TAG:-latest}
-  translation-ui:
-    build:
-      context: docker/ui
-      dockerfile: ./docker/Dockerfile
-    image: ${REGISTRY:-opea}/translation-ui:${TAG:-latest}

.github/workflows/pr-docker-compose-e2e.yml

@@ -5,11 +5,14 @@ name: E2E test with docker compose
 
 on:
   pull_request_target:
-    branches: [main]
+    branches: ["main", "*rc"]
     types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped
     paths:
-      - "**/docker/**"
-      - "**/tests/**"
+      - "**/Dockerfile**"
+      - "**.py"
+      - "**/docker_compose/**"
+      - "**/docker_image_build/**"
+      - "**/tests/test_compose**"
       - "**/ui/**"
       - "!**.md"
       - "!**.txt"
@@ -22,19 +25,22 @@ concurrency:
 
 jobs:
   get-test-matrix:
+    if: ${{ !github.event.pull_request.draft }}
     uses: ./.github/workflows/_get-test-matrix.yml
     with:
-      diff_excluded_files: '.github|README.md|*.txt|deprecate|kubernetes|manifest|gmc|assets'
+      diff_excluded_files: '.github|*.md|*.txt|kubernetes|manifest|gmc|assets|benchmark'
 
   example-test:
     needs: [get-test-matrix]
     strategy:
       matrix: ${{ fromJSON(needs.get-test-matrix.outputs.run_matrix) }}
       fail-fast: false
+    if: ${{ !github.event.pull_request.draft }}
     uses: ./.github/workflows/_run-docker-compose.yml
     with:
       registry: "opea"
       tag: "ci"
       example: ${{ matrix.example }}
       hardware: ${{ matrix.hardware }}
+      diff_excluded_files: '.github|*.md|*.txt|kubernetes|manifest|gmc|assets|benchmark'
     secrets: inherit

.github/workflows/pr-gmc-e2e.yaml

@@ -5,15 +5,14 @@ name: E2E test with GMC
 
 on:
   pull_request_target:
-    branches: [main]
+    branches: ["main", "*rc"]
     types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped
     paths:
-      - "**/kubernetes/**"
+      - "**/kubernetes/**/gmc/**"
       - "**/tests/test_gmc**"
       - "!**.md"
       - "!**.txt"
-      - "!**/kubernetes/manifests/**"
-  workflow_dispatch:
+      - "!**/kubernetes/**/manifests/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -23,9 +22,8 @@ jobs:
   job1:
     uses: ./.github/workflows/_get-test-matrix.yml
     with:
-      diff_excluded_files: '.github|deprecated|docker|assets|*.md|*.txt'
-      xeon_server_label: 'xeon'
-      gaudi_server_label: 'gaudi'
+      diff_excluded_files: '.github|docker_compose|manifest|assets|*.md|*.txt'
+      test_mode: "gmc"
 
   gmc-test:
     needs: [job1]

.github/workflows/pr-manifest-e2e.yml

@@ -4,14 +4,15 @@
 name: E2E test with manifests
 
 on:
-  pull_request:
-    branches: [main]
+  pull_request_target:
+    branches: ["main", "*rc"]
     types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped
     paths:
-      - "**/kubernetes/manifests/**"
+      - "**/kubernetes/**/manifests/**"
       - "**/tests/test_manifest**"
       - "!**.md"
       - "!**.txt"
+      - "!**/kubernetes/**/gmc/**"
   workflow_dispatch:
 
 concurrency:
@@ -22,27 +23,18 @@ jobs:
   job1:
     uses: ./.github/workflows/_get-test-matrix.yml
     with:
-      diff_excluded_files: '.github|deprecated|docker|assets|*.md|*.txt'
-      xeon_server_label: 'xeon'
-      gaudi_server_label: 'gaudi'
+      diff_excluded_files: '.github|docker_compose|gmc|assets|*.md|*.txt|benchmark'
+      test_mode: "manifest"
 
-  mega-image-build:
+  run-example:
     needs: job1
     strategy:
       matrix: ${{ fromJSON(needs.job1.outputs.run_matrix) }}
-    uses: ./.github/workflows/_image-build.yml
-    with:
-      image_tag: ${{ github.event.pull_request.head.sha }}
-      mega_service: "${{ matrix.example }}"
-      runner_label: "docker-build-${{ matrix.hardware }}"
-
-  manifest-test:
-    needs: [job1, mega-image-build]
-    strategy:
-      matrix: ${{ fromJSON(needs.job1.outputs.run_matrix) }}
-    uses: ./.github/workflows/_manifest-e2e.yml
+      fail-fast: false
+    uses: ./.github/workflows/_example-workflow.yml
     with:
+      node: ${{ matrix.hardware }}
       example: ${{ matrix.example }}
-      hardware: ${{ matrix.hardware }}
-      tag: ${{ needs.mega-image-build.outputs.image_tag }}
+      tag: ${{ github.event.pull_request.head.sha }}
+      test_k8s: true
     secrets: inherit

.github/workflows/push-image-build.yml

@@ -7,9 +7,8 @@ on:
   push:
     branches: [ 'main' ]
     paths:
-      - "**/docker/*.py"
-      - "**/docker/Dockerfile"
-      - "**/docker/ui/**"
+      - "**.py"
+      - "**Dockerfile"
   workflow_dispatch:
 
 concurrency:
@@ -20,38 +19,15 @@ jobs:
   job1:
     uses: ./.github/workflows/_get-test-matrix.yml
 
-  mega-image-build:
+  image-build:
     needs: job1
     strategy:
       matrix:
-        workload: ${{ fromJSON(needs.job1.outputs.run_matrix).include.*.example }}
-        hardware: ["gaudi","xeon"]
-    runs-on: docker-build-${{ matrix.hardware }}
-    steps:
-      - name: Clean up Working Directory
-        run: |
-          sudo rm -rf ${{github.workspace}}/*
-
-      - name: Checkout out Repo
-        uses: actions/checkout@v4
-
-      - name: Check Docker Compose File Exists
-        env:
-          service: ${{ matrix.workload }}
-        run: |
-          docker_compose_path="${{ github.workspace }}/.github/workflows/docker/compose/${service}-compose.yaml"
-          if [ -e $docker_compose_path ]; then
-            echo "file_exists=true" >> $GITHUB_ENV
-            echo "docker_compose_path=${docker_compose_path}" >> $GITHUB_ENV
-          else
-            echo "file_exists=false" >> $GITHUB_ENV
-            echo "docker_compose_path=${docker_compose_path} for this service does not exist, so skipping image build for this service!!!"
-          fi
-
-      - name: Build Image
-        if: env.file_exists == 'true'
-        uses: opea-project/validation/actions/image-build@main
+        example: ${{ fromJSON(needs.job1.outputs.run_matrix).include.*.example }}
+        node: ["gaudi","xeon"]
+      fail-fast: false
+    uses: ./.github/workflows/_example-workflow.yml
     with:
-          work_dir: ${{ github.workspace }}/${{ matrix.workload }}
-          docker_compose_path: ${{ env.docker_compose_path }}
-          registry: ${OPEA_IMAGE_REPO}opea
+      node: ${{ matrix.node }}
+      example: ${{ matrix.example }}
+    secrets: inherit

.github/workflows/push-infra-issue-creation.yml

@@ -5,7 +5,7 @@ on:
   push:
     branches: [ 'main','issue' ]
     paths:
-      - "**/docker/*/compose*.yaml"
+      - "**/docker_compose/**/compose*.yaml"
 
 name: Create an issue to GenAIInfra on push
 jobs:
@@ -25,7 +25,7 @@ jobs:
           base_commit=$(git rev-parse HEAD~1)
           merged_commit=$(git log -1 --format='%H')
           changed_files="$(git diff --name-only ${base_commit} ${merged_commit} | \
-          grep -E '.*/docker/.*/compose.*.yaml')" || true
+          grep -E '.*/docker_compose/.*/compose.*.yaml')" || true
 
           examples=$(printf '%s\n' "${changed_files[@]}" | grep '/' | cut -d'/' -f1 | sort -u)
           format_examples=$(echo "$examples" | tr '\n' ',')

.github/workflows/scripts/build_push.sh

@@ -1,72 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-set -xe
-
-IMAGE_REPO=${IMAGE_REPO:-$OPEA_IMAGE_REPO}
-IMAGE_TAG=${IMAGE_TAG:-latest}
-
-function getImagenameFromMega() {
-    echo $(echo "$1" | tr '[:upper:]' '[:lower:]')
-}
-
-function checkExist() {
-    IMAGE_NAME=$1
-    if [ $(curl -X GET http://localhost:5000/v2/opea/${IMAGE_NAME}/tags/list | grep -c ${IMAGE_TAG}) -ne 0 ]; then
-        echo "true"
-    else
-        echo "false"
-    fi
-}
-
-function docker_build() {
-    # check if if IMAGE_TAG is not "latest" and the image exists in the registry
-    if [ "$IMAGE_TAG" != "latest" ] && [ "$(checkExist $1)" == "true" ]; then
-        echo "Image ${IMAGE_REPO}opea/$1:$IMAGE_TAG already exists in the registry"
-        return
-    fi
-    # docker_build <service_name> <dockerfile>
-    if [ -z "$2" ]; then
-        DOCKERFILE_PATH=Dockerfile
-    else
-        DOCKERFILE_PATH=$2
-    fi
-    echo "Building ${IMAGE_REPO}opea/$1:$IMAGE_TAG using Dockerfile $DOCKERFILE_PATH"
-    # if https_proxy and http_proxy are set, pass them to docker build
-    if [ -z "$https_proxy" ]; then
-        docker build --no-cache -t ${IMAGE_REPO}opea/$1:$IMAGE_TAG -f $DOCKERFILE_PATH .
-    else
-        docker build --no-cache -t ${IMAGE_REPO}opea/$1:$IMAGE_TAG --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f $DOCKERFILE_PATH .
-    fi
-    docker push ${IMAGE_REPO}opea/$1:$IMAGE_TAG
-    docker rmi ${IMAGE_REPO}opea/$1:$IMAGE_TAG
-}
-
-# $1 is like "apple orange pear"
-for MEGA_SVC in $1; do
-    case $MEGA_SVC in
-        "ChatQnA"|"CodeGen"|"CodeTrans"|"DocSum"|"Translation"|"AudioQnA"|"SearchQnA"|"FaqGen")
-            cd $MEGA_SVC/docker
-            IMAGE_NAME="$(getImagenameFromMega $MEGA_SVC)"
-            docker_build ${IMAGE_NAME}
-            cd ui
-            docker_build ${IMAGE_NAME}-ui docker/Dockerfile
-            if [ "$MEGA_SVC" == "ChatQnA" ];then
-                docker_build ${IMAGE_NAME}-conversation-ui docker/Dockerfile.react
-            fi
-            if [ "$MEGA_SVC" == "DocSum" ];then
-                docker_build ${IMAGE_NAME}-react-ui docker/Dockerfile.react
-            fi
-            if [ "$MEGA_SVC" == "CodeGen" ];then
-                docker_build ${IMAGE_NAME}-react-ui docker/Dockerfile.react
-            fi
-            ;;
-        "VisualQnA")
-            echo "Not supported yet"
-            ;;
-        *)
-            echo "Unknown function: $MEGA_SVC"
-            ;;
-    esac
-done

.github/workflows/scripts/get_test_matrix.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+# example: 'ChatQnA', 'CodeGen', ...
+# hardware: 'xeon', 'gaudi', ...
+
+set -e
+changed_files=$changed_files
+test_mode=$test_mode
+run_matrix="{\"include\":["
+hardware_list="xeon gaudi" # current support hardware list
+
+examples=$(printf '%s\n' "${changed_files[@]}" | grep '/' | cut -d'/' -f1 | sort -u)
+for example in ${examples}; do
+    cd $WORKSPACE/$example
+    if [[ ! $(find . -type f | grep ${test_mode}) ]]; then continue; fi
+
+    run_hardware=""
+    if [[ $(printf '%s\n' "${changed_files[@]}" | grep ${example} | cut -d'/' -f2 | grep -E '*.py|Dockerfile*|ui|docker_image_build' ) ]]; then
+        # run test on all hardware if megaservice or ui code change
+        run_hardware=$hardware_list
+    else
+        for hardware in ${hardware_list}; do
+            if [[ $(printf '%s\n' "${changed_files[@]}" | grep ${example} | grep -c ${hardware}) != 0 ]]; then
+                run_hardware="${hardware} ${run_hardware}"
+            fi
+        done
+    fi
+    for hw in ${run_hardware}; do
+        run_matrix="${run_matrix}{\"example\":\"${example}\",\"hardware\":\"${hw}\"},"
+    done
+done
+
+run_matrix=$run_matrix"]}"
+echo "run_matrix=${run_matrix}"
+echo "run_matrix=${run_matrix}" >> $GITHUB_OUTPUT

.pre-commit-config.yaml

@@ -14,9 +14,9 @@ repos:
       - id: check-json
         exclude: |
           (?x)^(
-              ChatQnA/docker/ui/svelte/tsconfig.json|
+              ChatQnA/svelte/tsconfig.json|
               SearchQnA/ui/svelte/tsconfig.json|
-              DocSum/docker/ui/svelte/tsconfig.json
+              DocSum/svelte/tsconfig.json
           )$
       - id: check-yaml
         args: [--allow-multiple-documents]

AgentQnA/README.md

@@ -36,7 +36,7 @@ This example showcases a hierarchical multi-agent system for question-answering
 
    ```
    cd GenAIComps
-   docker build -t opea/comps-agent-langchain:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/agent/langchain/docker/Dockerfile .
+   docker build -t opea/comps-agent-langchain:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/agent/langchain/Dockerfile .
    ```
 
 2. Launch tool services </br>
@@ -67,7 +67,7 @@ This example showcases a hierarchical multi-agent system for question-answering
    To use openai llm, run command below.
 
    ```
-   cd docker/openai/
+   cd docker_compose/intel/cpu/xeon
    bash launch_agent_service_openai.sh
    ```
 

AgentQnA/docker_compose/intel/cpu/xeon/launch_agent_service_openai.sh

@@ -10,4 +10,4 @@ export OPENAI_API_KEY=${OPENAI_API_KEY}
 export WORKER_AGENT_URL="http://${ip_address}:9095/v1/chat/completions"
 export CRAG_SERVER=http://${ip_address}:8080
 
-docker compose -f docker-compose-agent-openai.yaml up -d
+docker compose -f compose_openai.yaml up -d

AgentQnA/tests/_test_compose_openai_on_xeon.sh

@@ -15,18 +15,18 @@ export TOOLSET_PATH=$WORKDIR/GenAIExamples/AgentQnA/tools/
 function build_agent_docker_image() {
     cd $WORKDIR
     if [ ! -d "GenAIComps" ] ; then
-        git clone https://github.com/opea-project/GenAIComps.git
+        git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
     fi
     cd GenAIComps
     echo PWD: $(pwd)
-    docker build -t opea/comps-agent-langchain:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/agent/langchain/docker/Dockerfile .
+    docker build -t opea/comps-agent-langchain:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/agent/langchain/Dockerfile .
 }
 
 function start_services() {
     echo "Starting CRAG server"
     docker run -d -p=8080:8000 docker.io/aicrowd/kdd-cup-24-crag-mock-api:v0
     echo "Starting Agent services"
-    cd $WORKDIR/GenAIExamples/AgentQnA/docker/openai
+    cd $WORKDIR/GenAIExamples/AgentQnA/docker_compose/intel/cpu/xeon/
     bash launch_agent_service_openai.sh
 }
 

AudioQnA/README.md

@@ -8,11 +8,11 @@ The AudioQnA service can be deployed on either Intel Gaudi2 or Intel XEON Scalab
 
 ### Deploy AudioQnA on Gaudi
 
-Refer to the [Gaudi Guide](./docker/gaudi/README.md) for instructions on deploying AudioQnA on Gaudi.
+Refer to the [Gaudi Guide](./docker_compose/intel/hpu/gaudi/README.md) for instructions on deploying AudioQnA on Gaudi.
 
 ### Deploy AudioQnA on Xeon
 
-Refer to the [Xeon Guide](./docker/xeon/README.md) for instructions on deploying AudioQnA on Xeon.
+Refer to the [Xeon Guide](./docker_compose/intel/cpu/xeon/README.md) for instructions on deploying AudioQnA on Xeon.
 
 ## Supported Models
 

AudioQnA/docker_compose/intel/cpu/xeon/README.md

@@ -14,10 +14,10 @@ cd GenAIComps
 ### 2. Build ASR Image
 
 ```bash
-docker build -t opea/whisper:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/asr/whisper/Dockerfile .
+docker build -t opea/whisper:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/asr/whisper/dependency/Dockerfile .
 
 
-docker build -t opea/asr:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/asr/Dockerfile .
+docker build -t opea/asr:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/asr/whisper/Dockerfile .
 ```
 
 ### 3. Build LLM Image
@@ -29,9 +29,9 @@ docker build --no-cache -t opea/llm-tgi:latest --build-arg https_proxy=$https_pr
 ### 4. Build TTS Image
 
 ```bash
-docker build -t opea/speecht5:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/tts/speecht5/Dockerfile .
+docker build -t opea/speecht5:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/tts/speecht5/dependency/Dockerfile .
 
-docker build -t opea/tts:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/tts/Dockerfile .
+docker build -t opea/tts:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/tts/speecht5/Dockerfile .
 ```
 
 ### 6. Build MegaService Docker Image
@@ -40,7 +40,7 @@ To construct the Mega Service, we utilize the [GenAIComps](https://github.com/op
 
 ```bash
 git clone https://github.com/opea-project/GenAIExamples.git
-cd GenAIExamples/AudioQnA/docker
+cd GenAIExamples/AudioQnA/
 docker build --no-cache -t opea/audioqna:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile .
 ```
 
@@ -80,7 +80,7 @@ export LLM_SERVICE_PORT=3007
 ## 🚀 Start the MegaService
 
 ```bash
-cd GenAIExamples/AudioQnA/docker/xeon/
+cd GenAIExamples/AudioQnA/docker_compose/intel/cpu/xeon/
 docker compose up -d
 ```
 

AudioQnA/docker_compose/intel/hpu/gaudi/README.md

@@ -14,10 +14,10 @@ cd GenAIComps
 ### 2. Build ASR Image
 
 ```bash
-docker build -t opea/whisper-gaudi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/asr/whisper/Dockerfile_hpu .
+docker build -t opea/whisper-gaudi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/asr/whisper/dependency/Dockerfile.intel_hpu .
 
 
-docker build -t opea/asr:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/asr/Dockerfile .
+docker build -t opea/asr:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/asr/whisper/Dockerfile .
 ```
 
 ### 3. Build LLM Image
@@ -29,9 +29,9 @@ docker build --no-cache -t opea/llm-tgi:latest --build-arg https_proxy=$https_pr
 ### 4. Build TTS Image
 
 ```bash
-docker build -t opea/speecht5-gaudi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/tts/speecht5/Dockerfile_hpu .
+docker build -t opea/speecht5-gaudi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/tts/speecht5/dependency/Dockerfile.intel_hpu .
 
-docker build -t opea/tts:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/tts/Dockerfile .
+docker build -t opea/tts:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/tts/speecht5/Dockerfile .
 ```
 
 ### 6. Build MegaService Docker Image
@@ -40,7 +40,7 @@ To construct the Mega Service, we utilize the [GenAIComps](https://github.com/op
 
 ```bash
 git clone https://github.com/opea-project/GenAIExamples.git
-cd GenAIExamples/AudioQnA/docker
+cd GenAIExamples/AudioQnA/
 docker build --no-cache -t opea/audioqna:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile .
 ```
 
@@ -80,7 +80,7 @@ export LLM_SERVICE_PORT=3007
 ## 🚀 Start the MegaService
 
 ```bash
-cd GenAIExamples/AudioQnA/docker/gaudi/
+cd GenAIExamples/AudioQnA/docker_compose/intel/hpu/gaudi/
 docker compose up -d
 ```
 

AudioQnA/docker_image_build/build.yaml

@@ -8,24 +8,25 @@ services:
         http_proxy: ${http_proxy}
         https_proxy: ${https_proxy}
         no_proxy: ${no_proxy}
+      context: ../
       dockerfile: ./Dockerfile
     image: ${REGISTRY:-opea}/audioqna:${TAG:-latest}
   whisper-gaudi:
     build:
       context: GenAIComps
-      dockerfile: comps/asr/whisper/Dockerfile_hpu
+      dockerfile: comps/asr/whisper/dependency/Dockerfile.intel_hpu
     extends: audioqna
     image: ${REGISTRY:-opea}/whisper-gaudi:${TAG:-latest}
   whisper:
     build:
       context: GenAIComps
-      dockerfile: comps/asr/whisper/Dockerfile
+      dockerfile: comps/asr/whisper/dependency/Dockerfile
     extends: audioqna
     image: ${REGISTRY:-opea}/whisper:${TAG:-latest}
   asr:
     build:
       context: GenAIComps
-      dockerfile: comps/asr/Dockerfile
+      dockerfile: comps/asr/whisper/Dockerfile
     extends: audioqna
     image: ${REGISTRY:-opea}/asr:${TAG:-latest}
   llm-tgi:
@@ -37,18 +38,18 @@ services:
   speecht5-gaudi:
     build:
       context: GenAIComps
-      dockerfile: comps/tts/speecht5/Dockerfile_hpu
+      dockerfile: comps/tts/speecht5/dependency/Dockerfile.intel_hpu
     extends: audioqna
     image: ${REGISTRY:-opea}/speecht5-gaudi:${TAG:-latest}
   speecht5:
     build:
       context: GenAIComps
-      dockerfile: comps/tts/speecht5/Dockerfile
+      dockerfile: comps/tts/speecht5/dependency/Dockerfile
     extends: audioqna
     image: ${REGISTRY:-opea}/speecht5:${TAG:-latest}
   tts:
     build:
       context: GenAIComps
-      dockerfile: comps/tts/Dockerfile
+      dockerfile: comps/tts/speecht5/Dockerfile
     extends: audioqna
     image: ${REGISTRY:-opea}/tts:${TAG:-latest}

AudioQnA/kubernetes/intel/README_gmc.md

@@ -30,7 +30,7 @@ For Gaudi:
 - speecht5-gaudi: opea/speecht5-gaudi:latest
 
 > [NOTE]  
-> Please refer to [Xeon README](https://github.com/opea-project/GenAIExamples/blob/main/AudioQnA/docker/xeon/README.md) or [Gaudi README](https://github.com/opea-project/GenAIExamples/blob/main/AudioQnA/docker/gaudi/README.md) to build the OPEA images. These too will be available on Docker Hub soon to simplify use.
+> Please refer to [Xeon README](https://github.com/opea-project/GenAIExamples/blob/main/AudioQnA/docker_compose/intel/cpu/xeon/README.md) or [Gaudi README](https://github.com/opea-project/GenAIExamples/blob/main/AudioQnA/docker_compose/intel/hpu/gaudi/README.md) to build the OPEA images. These too will be available on Docker Hub soon to simplify use.
 
 ## Deploy AudioQnA pipeline
 This involves deploying the AudioQnA custom resource. You can use audioQnA_xeon.yaml or if you have a Gaudi cluster, you could use audioQnA_gaudi.yaml. 

AudioQnA/tests/test_compose_on_gaudi.sh

@@ -15,19 +15,19 @@ LOG_PATH="$WORKPATH/tests"
 ip_address=$(hostname -I | awk '{print $1}')
 
 function build_docker_images() {
-    cd $WORKPATH/docker
-    git clone https://github.com/opea-project/GenAIComps.git
+    cd $WORKPATH/docker_image_build
+    git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
 
     echo "Build all the images with --no-cache, check docker_image_build.log for details..."
     service_list="audioqna whisper-gaudi asr llm-tgi speecht5-gaudi tts"
-    docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
+    docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
 
     docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1
     docker images && sleep 1s
 }
 
 function start_services() {
-    cd $WORKPATH/docker/gaudi
+    cd $WORKPATH/docker_compose/intel/hpu/gaudi
     export HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
 
     export TGI_LLM_ENDPOINT=http://$ip_address:3006
@@ -116,7 +116,7 @@ function validate_megaservice() {
 #}
 
 function stop_docker() {
-    cd $WORKPATH/docker/gaudi
+    cd $WORKPATH/docker_compose/intel/hpu/gaudi
     docker compose stop && docker compose rm -f
 }
 

AudioQnA/tests/test_compose_on_xeon.sh

@@ -15,19 +15,19 @@ LOG_PATH="$WORKPATH/tests"
 ip_address=$(hostname -I | awk '{print $1}')
 
 function build_docker_images() {
-    cd $WORKPATH/docker
-    git clone https://github.com/opea-project/GenAIComps.git
+    cd $WORKPATH/docker_image_build
+    git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
 
     echo "Build all the images with --no-cache, check docker_image_build.log for details..."
     service_list="audioqna whisper asr llm-tgi speecht5 tts"
-    docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
+    docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
 
     docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1
     docker images && sleep 1s
 }
 
 function start_services() {
-    cd $WORKPATH/docker/xeon
+    cd $WORKPATH/docker_compose/intel/cpu/xeon/
     export HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
     export TGI_LLM_ENDPOINT=http://$ip_address:3006
     export LLM_MODEL_ID=Intel/neural-chat-7b-v3-3
@@ -106,7 +106,7 @@ function validate_megaservice() {
 #}
 
 function stop_docker() {
-    cd $WORKPATH/docker/xeon
+    cd $WORKPATH/docker_compose/intel/cpu/xeon/
     docker compose stop && docker compose rm -f
 }
 

AudioQnA/tests/test_gmc_on_gaudi.sh

@@ -96,12 +96,12 @@ fi
 
 case "$1" in
     install_AudioQnA)
-        pushd AudioQnA/kubernetes
+        pushd AudioQnA/kubernetes/intel/hpu/gaudi/gmc
         install_audioqa
         popd
         ;;
     validate_AudioQnA)
-        pushd AudioQnA/kubernetes
+        pushd AudioQnA/kubernetes/intel/hpu/gaudi/gmc
         validate_audioqa
         popd
         ;;

AudioQnA/tests/test_gmc_on_xeon.sh

@@ -96,12 +96,12 @@ fi
 
 case "$1" in
     install_AudioQnA)
-        pushd AudioQnA/kubernetes
+        pushd AudioQnA/kubernetes/intel/cpu/xeon/gmc
         install_audioqa
         popd
         ;;
     validate_AudioQnA)
-        pushd AudioQnA/kubernetes
+        pushd AudioQnA/kubernetes/intel/cpu/xeon/gmc
         validate_audioqa
         popd
         ;;

AudioQnA/ui/svelte/README.md

@@ -2,8 +2,8 @@
 
 ## 📸 Project Screenshots
 
-![project-screenshot](../../../assets/img/audio_ui.png)
-![project-screenshot](../../../assets/img/audio_ui_record.png)
+![project-screenshot](../../assets/img/audio_ui.png)
+![project-screenshot](../../assets/img/audio_ui_record.png)
 
 ## 🧐 Features