fix ci issue

Signed-off-by: Tsai, Louie <louie.tsai@intel.com>

Author: louie-tsai

AgentQnA/README.md

@@ -99,6 +99,7 @@ git clone https://github.com/opea-project/GenAIExamples.git
 #### Second, set up environment variables.
 
 ##### For proxy environments only
+
 ```
 export http_proxy="Your_HTTP_Proxy"
 export https_proxy="Your_HTTPs_Proxy"
@@ -122,16 +123,19 @@ export OPENAI_API_KEY=<your-openai-key>
 #### Third, set up environment variables for the selected hardware using the corresponding `set_env.sh`
 
 ##### Gaudi
+
 ```
 source $WORKDIR/GenAIExamples/AgentQnA/docker_compose/intel/hpu/gaudi/set_env.sh
 ```
 
 ##### Xeon
+
 ```
 source $WORKDIR/GenAIExamples/AgentQnA/docker_compose/intel/cpu/xeon/set_env.sh
 ```
 
 ### ROCM
+
 ```
 source $WORKDIR/GenAIExamples/AgentQnA/docker_compose/amd/gpu/rocm/set_env.sh
 ```
@@ -144,9 +148,9 @@ Two options are provided for the `llm_engine` of the agents: 1. open-source LLMs
 
 On Gaudi, `meta-llama/Meta-Llama-3.1-70B-Instruct` will be served using vllm.
 By default, both the RAG agent and SQL agent will be launched to support the React Agent.  
-The React Agent requires the DocIndexRetriever's [`compose.yaml`](../DocIndexRetriever/docker_compose/intel/cpu/xeon/compose.yaml) file, so two `compose.yaml` files need to be run with docker compose to start the multi-agent system. 
+The React Agent requires the DocIndexRetriever's [`compose.yaml`](../DocIndexRetriever/docker_compose/intel/cpu/xeon/compose.yaml) file, so two `compose.yaml` files need to be run with docker compose to start the multi-agent system.
 
->**Note**: To enable the web search tool, skip this step and proceed to the "[Optional] Web Search Tool Support" section.
+> **Note**: To enable the web search tool, skip this step and proceed to the "[Optional] Web Search Tool Support" section.
 
 ```bash
 cd $WORKDIR/GenAIExamples/AgentQnA/docker_compose/intel/hpu/gaudi/
@@ -190,7 +194,7 @@ cd  $WORKDIR/GenAIExamples/AgentQnA/retrieval_tool/
 bash run_ingest_data.sh
 ```
 
->**Note**: This is a one-time operation.
+> **Note**: This is a one-time operation.
 
 ## Launch the UI
 

AgentQnA/tests/step4_launch_and_validate_agent_gaudi.sh

@@ -191,8 +191,6 @@ function main() {
     echo "==================== Start all services ===================="
     start_all_services
     echo "==================== all services started ===================="
-<<<<<<< HEAD
-=======
 
     echo "==================== Ingest data ===================="
     ingest_data_and_validate
@@ -201,7 +199,6 @@ function main() {
     echo "==================== Validate retrieval tool ===================="
     validate_retrieval_tool
     echo "==================== Retrieval tool validated ===================="
->>>>>>> b56a1cdafe9c424bf2f57674c526d118c826e85e
 
     echo "==================== Validate agent service ===================="
     validate_agent_service

AgentQnA/tests/test_compose_on_gaudi.sh

@@ -9,6 +9,7 @@ echo "WORKDIR=${WORKDIR}"
 export ip_address=$(hostname -I | awk '{print $1}')
 export HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
 export TOOLSET_PATH=$WORKDIR/GenAIExamples/AgentQnA/tools/
+export no_proxy="$no_proxy,rag-agent-endpoint,sql-agent-endpoint,react-agent-endpoint,agent-ui,vllm-gaudi-server,jaeger,grafana,prometheus,127.0.0.1,localhost,0.0.0.0,$ip_address"
 
 
 function get_genai_comps() {
@@ -77,19 +78,12 @@ echo "=================== #1 Building docker images===================="
 build_agent_docker_image
 echo "=================== #1 Building docker images completed===================="
 
-<<<<<<< HEAD
-=======
 
 echo "=================== #4 Start agent, API server, retrieval, and ingest data===================="
 bash $WORKPATH/tests/step4_launch_and_validate_agent_gaudi.sh
 echo "=================== #4 Agent, retrieval test passed ===================="
->>>>>>> b56a1cdafe9c424bf2f57674c526d118c826e85e
 
 
-echo "=================== #3 Ingest data and validate retrieval===================="
-bash step3_ingest_data_and_validate_retrieval.sh
-echo "=================== #3 Data ingestion and validation completed===================="
-
 echo "=================== #5 Stop agent and API server===================="
 stop_crag
 stop_agent_docker