From 4ff9ed59715acb676f9ba4ebaef8afe110d4f402 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Fri, 2 Jun 2023 15:27:45 +0800 Subject: [PATCH] ci: fix duplicated names for app list issue --- .gitlab/ci/build.yml | 3 +++ tools/ci/ci_build_apps.py | 7 ++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml index 3e0e7e9ca2..3adade0aa0 100644 --- a/.gitlab/ci/build.yml +++ b/.gitlab/ci/build.yml @@ -127,6 +127,7 @@ --pytest-apps --parallel-count ${CI_NODE_TOTAL:-1} --parallel-index ${CI_NODE_INDEX:-1} + --collect-app-info "list_job_${CI_JOB_NAME_SLUG}.txt" --modified-components ${MR_MODIFIED_COMPONENTS} --modified-files ${MR_MODIFIED_FILES} @@ -140,6 +141,7 @@ --pytest-apps --parallel-count ${CI_NODE_TOTAL:-1} --parallel-index ${CI_NODE_INDEX:-1} + --collect-app-info "list_job_${CI_JOB_NAME_SLUG}.txt" --modified-components ${MR_MODIFIED_COMPONENTS} --modified-files ${MR_MODIFIED_FILES} @@ -172,6 +174,7 @@ --pytest-apps --parallel-count ${CI_NODE_TOTAL:-1} --parallel-index ${CI_NODE_INDEX:-1} + --collect-app-info "list_job_${CI_JOB_NAME_SLUG}.txt" --modified-components ${MR_MODIFIED_COMPONENTS} --modified-files ${MR_MODIFIED_FILES} diff --git a/tools/ci/ci_build_apps.py b/tools/ci/ci_build_apps.py index b7443395a0..24413b5050 100644 --- a/tools/ci/ci_build_apps.py +++ b/tools/ci/ci_build_apps.py @@ -204,7 +204,7 @@ def main(args: argparse.Namespace) -> None: build_verbose=args.build_verbose, keep_going=True, collect_size_info='size_info.txt', - collect_app_info='list_job_@p.txt', + collect_app_info=args.collect_app_info, ignore_warning_strs=args.ignore_warning_str, ignore_warning_file=args.ignore_warning_file, copy_sdkconfig=args.copy_sdkconfig, @@ -265,12 +265,9 @@ if __name__ == '__main__': type=int, help='Index (1-based) of the job, out of the number specified by --parallel-count.', ) - parser.add_argument( - '--collect-size-info', - help='If specified, the test case name and size info json will be written to this file', - ) parser.add_argument( '--collect-app-info', + default='list_job_@p.txt', help='If specified, the test case name and app info json will be written to this file', ) parser.add_argument(