From df67bcca0fda456134e721c59efdae09dc0b02fb Mon Sep 17 00:00:00 2001 From: chensuyue Date: Fri, 14 Feb 2025 11:36:21 +0800 Subject: [PATCH 1/7] Expand CI test scope, trigger all hw test when the common test scripts changed. Signed-off-by: chensuyue --- .github/workflows/scripts/get_test_matrix.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/scripts/get_test_matrix.sh b/.github/workflows/scripts/get_test_matrix.sh index 7eb0362ef2..3d7d32b1e9 100644 --- a/.github/workflows/scripts/get_test_matrix.sh +++ b/.github/workflows/scripts/get_test_matrix.sh @@ -28,6 +28,9 @@ for example in ${examples}; do 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 + elif [[ $(printf '%s\n' "${changed_files[@]}" | grep ${example} | grep 'tests' | grep -vE '^test_|^_test' ) ]]; then + # run test on all hardware if common test scripts 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 From 34cc188f0d374be4ba6939c8793e0f6190283957 Mon Sep 17 00:00:00 2001 From: chensuyue Date: Fri, 14 Feb 2025 11:38:39 +0800 Subject: [PATCH 2/7] for test Signed-off-by: chensuyue --- .github/workflows/pr-docker-compose-e2e.yml | 2 +- ChatQnA/tests/test_compose_on_xeon.sh | 1 + WorkflowExecAgent/tests/1_build_images.sh | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-docker-compose-e2e.yml b/.github/workflows/pr-docker-compose-e2e.yml index c924f0e26a..74b8a51765 100644 --- a/.github/workflows/pr-docker-compose-e2e.yml +++ b/.github/workflows/pr-docker-compose-e2e.yml @@ -4,7 +4,7 @@ name: E2E test with docker compose on: - pull_request_target: + pull_request: branches: ["main", "*rc"] types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped paths: diff --git a/ChatQnA/tests/test_compose_on_xeon.sh b/ChatQnA/tests/test_compose_on_xeon.sh index c253226486..eb14eccdb2 100644 --- a/ChatQnA/tests/test_compose_on_xeon.sh +++ b/ChatQnA/tests/test_compose_on_xeon.sh @@ -1,6 +1,7 @@ #!/bin/bash # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 +# for test only set -e IMAGE_REPO=${IMAGE_REPO:-"opea"} diff --git a/WorkflowExecAgent/tests/1_build_images.sh b/WorkflowExecAgent/tests/1_build_images.sh index 5dad2e3a7a..2beec955ea 100644 --- a/WorkflowExecAgent/tests/1_build_images.sh +++ b/WorkflowExecAgent/tests/1_build_images.sh @@ -1,6 +1,7 @@ #!/bin/bash # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 +# for test only set -e WORKPATH=$(dirname "$PWD") From a9befbfb22589335b6317800e2d9932850a61d53 Mon Sep 17 00:00:00 2001 From: chensuyue Date: Fri, 14 Feb 2025 11:46:21 +0800 Subject: [PATCH 3/7] add debug code Signed-off-by: chensuyue --- .github/workflows/scripts/get_test_matrix.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scripts/get_test_matrix.sh b/.github/workflows/scripts/get_test_matrix.sh index 3d7d32b1e9..af0e5ffe79 100644 --- a/.github/workflows/scripts/get_test_matrix.sh +++ b/.github/workflows/scripts/get_test_matrix.sh @@ -26,10 +26,10 @@ for example in ${examples}; do 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 + echo "run test on all hardware if megaservice or ui code change..." run_hardware=$hardware_list elif [[ $(printf '%s\n' "${changed_files[@]}" | grep ${example} | grep 'tests' | grep -vE '^test_|^_test' ) ]]; then - # run test on all hardware if common test scripts change + echo "run test on all hardware if common test scripts change..." run_hardware=$hardware_list else for hardware in ${hardware_list}; do From d563561cfe89d0297a99d70d3fdc1d0666953be2 Mon Sep 17 00:00:00 2001 From: chensuyue Date: Fri, 14 Feb 2025 13:04:25 +0800 Subject: [PATCH 4/7] bug fix Signed-off-by: chensuyue --- .github/workflows/scripts/get_test_matrix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scripts/get_test_matrix.sh b/.github/workflows/scripts/get_test_matrix.sh index af0e5ffe79..2d6efddd24 100644 --- a/.github/workflows/scripts/get_test_matrix.sh +++ b/.github/workflows/scripts/get_test_matrix.sh @@ -28,7 +28,7 @@ for example in ${examples}; do if [[ $(printf '%s\n' "${changed_files[@]}" | grep ${example} | cut -d'/' -f2 | grep -E '\.py|Dockerfile*|ui|docker_image_build' ) ]]; then echo "run test on all hardware if megaservice or ui code change..." run_hardware=$hardware_list - elif [[ $(printf '%s\n' "${changed_files[@]}" | grep ${example} | grep 'tests' | grep -vE '^test_|^_test' ) ]]; then + elif [[ $(printf '%s\n' "${changed_files[@]}" | grep ${example} | grep 'tests'| cut -d'/' -f3 | grep -vE '^test_|^_test' ) ]]; then echo "run test on all hardware if common test scripts change..." run_hardware=$hardware_list else From 751deeb013453f0f07eaaa972af912195885b839 Mon Sep 17 00:00:00 2001 From: chensuyue Date: Fri, 14 Feb 2025 16:45:10 +0800 Subject: [PATCH 5/7] optimize Signed-off-by: chensuyue --- .github/workflows/_run-docker-compose.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/_run-docker-compose.yml b/.github/workflows/_run-docker-compose.yml index 4cedc7f447..365c8ea2d4 100644 --- a/.github/workflows/_run-docker-compose.yml +++ b/.github/workflows/_run-docker-compose.yml @@ -84,6 +84,12 @@ jobs: run_test_cases="$run_test_cases $test_case" fi done + + set -x + if [ -z "$run_test_cases" ] && [[ $(printf '%s\n' "${changed_files[@]}" | grep ${{ inputs.example }} | grep /tests/) ]]; then + run_test_cases=$other_test_cases + fi + set +x test_cases=$(echo $run_test_cases | tr ' ' '\n' | sort -u | jq -R '.' | jq -sc '.') echo "test_cases=$test_cases" From 7cfccbdc7e419e7915d6d3afd2237529c2dae38c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2025 08:51:08 +0000 Subject: [PATCH 6/7] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/_run-docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_run-docker-compose.yml b/.github/workflows/_run-docker-compose.yml index 365c8ea2d4..e6f6c2e328 100644 --- a/.github/workflows/_run-docker-compose.yml +++ b/.github/workflows/_run-docker-compose.yml @@ -84,7 +84,7 @@ jobs: run_test_cases="$run_test_cases $test_case" fi done - + set -x if [ -z "$run_test_cases" ] && [[ $(printf '%s\n' "${changed_files[@]}" | grep ${{ inputs.example }} | grep /tests/) ]]; then run_test_cases=$other_test_cases From 62e6202b6fb9fc1da8a948b338717dc5f872f80e Mon Sep 17 00:00:00 2001 From: chensuyue Date: Fri, 14 Feb 2025 17:21:30 +0800 Subject: [PATCH 7/7] Revert "for test" This reverts commit 34cc188f0d374be4ba6939c8793e0f6190283957. Signed-off-by: chensuyue --- .github/workflows/_run-docker-compose.yml | 2 -- .github/workflows/pr-docker-compose-e2e.yml | 2 +- ChatQnA/tests/test_compose_on_xeon.sh | 1 - WorkflowExecAgent/tests/1_build_images.sh | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/_run-docker-compose.yml b/.github/workflows/_run-docker-compose.yml index e6f6c2e328..54ec72eea3 100644 --- a/.github/workflows/_run-docker-compose.yml +++ b/.github/workflows/_run-docker-compose.yml @@ -85,11 +85,9 @@ jobs: fi done - set -x if [ -z "$run_test_cases" ] && [[ $(printf '%s\n' "${changed_files[@]}" | grep ${{ inputs.example }} | grep /tests/) ]]; then run_test_cases=$other_test_cases fi - set +x test_cases=$(echo $run_test_cases | tr ' ' '\n' | sort -u | jq -R '.' | jq -sc '.') echo "test_cases=$test_cases" diff --git a/.github/workflows/pr-docker-compose-e2e.yml b/.github/workflows/pr-docker-compose-e2e.yml index 74b8a51765..c924f0e26a 100644 --- a/.github/workflows/pr-docker-compose-e2e.yml +++ b/.github/workflows/pr-docker-compose-e2e.yml @@ -4,7 +4,7 @@ name: E2E test with docker compose on: - pull_request: + pull_request_target: branches: ["main", "*rc"] types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped paths: diff --git a/ChatQnA/tests/test_compose_on_xeon.sh b/ChatQnA/tests/test_compose_on_xeon.sh index eb14eccdb2..c253226486 100644 --- a/ChatQnA/tests/test_compose_on_xeon.sh +++ b/ChatQnA/tests/test_compose_on_xeon.sh @@ -1,7 +1,6 @@ #!/bin/bash # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -# for test only set -e IMAGE_REPO=${IMAGE_REPO:-"opea"} diff --git a/WorkflowExecAgent/tests/1_build_images.sh b/WorkflowExecAgent/tests/1_build_images.sh index 2beec955ea..5dad2e3a7a 100644 --- a/WorkflowExecAgent/tests/1_build_images.sh +++ b/WorkflowExecAgent/tests/1_build_images.sh @@ -1,7 +1,6 @@ #!/bin/bash # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -# for test only set -e WORKPATH=$(dirname "$PWD")