فهرست منبع

ci: fix duplicated names for app list issue

Fu Hanxi 2 سال پیش
والد
کامیت
4ff9ed5971
2فایلهای تغییر یافته به همراه5 افزوده شده و 5 حذف شده
  1. 3 0
      .gitlab/ci/build.yml
  2. 2 5
      tools/ci/ci_build_apps.py

+ 3 - 0
.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}
 

+ 2 - 5
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(