From 57a8bfa79494fec3ecc3639b105df25b7113f234 Mon Sep 17 00:00:00 2001 From: chensuyue Date: Mon, 12 May 2025 11:15:57 +0800 Subject: [PATCH 1/3] Group log lines in GHA outputs for better readable logs. Signed-off-by: chensuyue --- DBQnA/docker_image_build/build.yaml | 6 +++--- DBQnA/tests/test_compose_on_rocm.sh | 30 +++++++++++++++++++++++++---- DBQnA/tests/test_compose_on_xeon.sh | 21 +++++++++++++++++--- 3 files changed, 47 insertions(+), 10 deletions(-) diff --git a/DBQnA/docker_image_build/build.yaml b/DBQnA/docker_image_build/build.yaml index 4c4cc9e3f4..072d9c57ea 100644 --- a/DBQnA/docker_image_build/build.yaml +++ b/DBQnA/docker_image_build/build.yaml @@ -7,6 +7,8 @@ services: context: GenAIComps dockerfile: comps/text2sql/src/Dockerfile args: + IMAGE_REPO: ${REGISTRY:-opea} + BASE_TAG: ${TAG:-latest} http_proxy: ${http_proxy} https_proxy: ${https_proxy} no_proxy: ${no_proxy} @@ -16,8 +18,6 @@ services: context: ../ui dockerfile: ./docker/Dockerfile.react args: - http_proxy: ${http_proxy} - https_proxy: ${https_proxy} - no_proxy: ${no_proxy} texttosql_url: ${build_texttosql_url} + expends: text2sql image: ${REGISTRY:-opea}/text2sql-react-ui:${TAG:-latest} diff --git a/DBQnA/tests/test_compose_on_rocm.sh b/DBQnA/tests/test_compose_on_rocm.sh index df83d4fbec..8a651660ce 100644 --- a/DBQnA/tests/test_compose_on_rocm.sh +++ b/DBQnA/tests/test_compose_on_rocm.sh @@ -4,6 +4,13 @@ set -xe +IMAGE_REPO=${IMAGE_REPO:-"opea"} +IMAGE_TAG=${IMAGE_TAG:-"latest"} +echo "REGISTRY=IMAGE_REPO=${IMAGE_REPO}" +echo "TAG=IMAGE_TAG=${IMAGE_TAG}" +export REGISTRY=${IMAGE_REPO} +export TAG=${IMAGE_TAG} + WORKPATH=$(dirname "$PWD") LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') @@ -95,16 +102,31 @@ function stop_docker() { function main() { + echo "::group::stop_docker" stop_docker + echo "::endgroup::" + + echo "::group::build_docker_images" + if [[ "$IMAGE_REPO" == "opea" ]]; then build_docker_images; fi + echo "::endgroup::" + + echo "::group::start_services" + start_services + echo "::endgroup::" - build_docker_images - start_service - sleep 10s + echo "::group::validate_microservice" validate_microservice + echo "::endgroup::" + + echo "::group::validate_frontend" validate_frontend + echo "::endgroup::" + echo "::group::stop_docker" stop_docker - echo y | docker system prune + echo "::endgroup::" + + docker system prune -f } diff --git a/DBQnA/tests/test_compose_on_xeon.sh b/DBQnA/tests/test_compose_on_xeon.sh index 751d3ac24b..cfd62d1ef4 100755 --- a/DBQnA/tests/test_compose_on_xeon.sh +++ b/DBQnA/tests/test_compose_on_xeon.sh @@ -101,16 +101,31 @@ function stop_docker() { function main() { + echo "::group::stop_docker" stop_docker + echo "::endgroup::" - build_docker_images - start_service + echo "::group::build_docker_images" + if [[ "$IMAGE_REPO" == "opea" ]]; then build_docker_images; fi + echo "::endgroup::" + echo "::group::start_services" + start_services + echo "::endgroup::" + + echo "::group::validate_microservice" validate_microservice + echo "::endgroup::" + + echo "::group::validate_frontend" validate_frontend + echo "::endgroup::" + echo "::group::stop_docker" stop_docker - echo y | docker system prune + echo "::endgroup::" + + docker system prune -f } From 39a4d1734e80dd4b2b6b4d16d34c81df5ef7a1cf Mon Sep 17 00:00:00 2001 From: "chen, suyue" Date: Tue, 13 May 2025 09:32:01 +0800 Subject: [PATCH 2/3] Update DBQnA/docker_image_build/build.yaml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- DBQnA/docker_image_build/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DBQnA/docker_image_build/build.yaml b/DBQnA/docker_image_build/build.yaml index 072d9c57ea..11d7f518b6 100644 --- a/DBQnA/docker_image_build/build.yaml +++ b/DBQnA/docker_image_build/build.yaml @@ -19,5 +19,5 @@ services: dockerfile: ./docker/Dockerfile.react args: texttosql_url: ${build_texttosql_url} - expends: text2sql + extends: text2sql image: ${REGISTRY:-opea}/text2sql-react-ui:${TAG:-latest} From ef10fe4ee5d7d41f6261156ee51655889d113135 Mon Sep 17 00:00:00 2001 From: chensuyue Date: Wed, 14 May 2025 11:16:38 +0800 Subject: [PATCH 3/3] update function name Signed-off-by: chensuyue --- DBQnA/tests/test_compose_on_rocm.sh | 2 +- DBQnA/tests/test_compose_on_xeon.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DBQnA/tests/test_compose_on_rocm.sh b/DBQnA/tests/test_compose_on_rocm.sh index 8a651660ce..e2dc0b81d6 100644 --- a/DBQnA/tests/test_compose_on_rocm.sh +++ b/DBQnA/tests/test_compose_on_rocm.sh @@ -32,7 +32,7 @@ function build_docker_images() { docker images && sleep 1s } -function start_service() { +function start_services() { cd "$WORKPATH"/docker_compose/amd/gpu/rocm # Start Docker Containers docker compose up -d > "${LOG_PATH}"/start_services_with_compose.log diff --git a/DBQnA/tests/test_compose_on_xeon.sh b/DBQnA/tests/test_compose_on_xeon.sh index cfd62d1ef4..c410cc48f8 100755 --- a/DBQnA/tests/test_compose_on_xeon.sh +++ b/DBQnA/tests/test_compose_on_xeon.sh @@ -27,7 +27,7 @@ function build_docker_images() { docker images && sleep 1s } -function start_service() { +function start_services() { cd $WORKPATH/docker_compose/intel/cpu/xeon source ./set_env.sh