Merge branch 'refactor_comps' of https://github.com/opea-project/GenA…

…IComps into refactor_comps
opea-project · Dec 20, 2024 · c03e1c4 · c03e1c4
2 parents 049452a + cde85ca
commit c03e1c4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/scripts/get_test_matrix.sh b/.github/workflows/scripts/get_test_matrix.sh
@@ -55,15 +55,17 @@ function find_test_1() {
 function find_test_2() {
     test_files=$(printf '%s\n' "${changed_files[@]}" | grep -E "*.sh") || true
     for test_file in ${test_files}; do
-        _service=$(echo $test_file | cut -d'/' -f3 | cut -d'.' -f1 | cut -c6-)
-        if [ $(echo ${_service} | grep -c "_on_") == 0 ]; then
-            service=${_service}
-            hardware="intel_cpu"
-        else
-            hardware=${_service#*_on_}
-        fi
-        if [[ $(echo ${run_matrix} | grep -c "{\"service\":\"${_service}\",\"hardware\":\"${hardware}\"},") == 0 ]]; then
-            run_matrix="${run_matrix}{\"service\":\"${_service}\",\"hardware\":\"${hardware}\"},"
+        if [ -f $test_file ]; then
+            _service=$(echo $test_file | cut -d'/' -f3 | cut -d'.' -f1 | cut -c6-)
+            if [ $(echo ${_service} | grep -c "_on_") == 0 ]; then
+                service=${_service}
+                hardware="intel_cpu"
+            else
+                hardware=${_service#*_on_}
+            fi
+            if [[ $(echo ${run_matrix} | grep -c "{\"service\":\"${_service}\",\"hardware\":\"${hardware}\"},") == 0 ]]; then
+                run_matrix="${run_matrix}{\"service\":\"${_service}\",\"hardware\":\"${hardware}\"},"
+            fi
         fi
     done
 }

diff --git a/tests/dataprep/test_dataprep_multimodal_redis_langchain.sh b/tests/dataprep/test_dataprep_multimodal_redis_langchain.sh
@@ -37,14 +37,14 @@ function build_docker_images() {
 function build_lvm_docker_images() {
     cd $WORKPATH
     echo $(pwd)
-    docker build --no-cache -t opea/lvm-llava:comps -f comps/lvms/llava/dependency/Dockerfile .
+    docker build --no-cache -t opea/lvm-llava:comps -f comps/lvms/src/llava/dependency/Dockerfile .
     if [ $? -ne 0 ]; then
         echo "opea/lvm-llava built fail"
         exit 1
     else
         echo "opea/lvm-llava built successful"
     fi
-    docker build --no-cache -t opea/lvm-llava-svc:comps -f comps/lvms/llava/Dockerfile .
+    docker build --no-cache -t opea/lvm-llava-svc:comps -f comps/lvms/src/llava/Dockerfile .
     if [ $? -ne 0 ]; then
         echo "opea/lvm-llava-svc built fail"
         exit 1