From 158eb78555b3971723fa7966c7c6ca0c7ad76908 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Wed, 16 Jul 2025 13:53:44 +0200 Subject: [PATCH] ci: add `CI_JOB_ID` as suffix to help ci-dashboard parse info easier --- .idf_build_apps.toml | 3 +-- .idf_ci.toml | 2 +- tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.idf_build_apps.toml b/.idf_build_apps.toml index bbc0025290..470ad263ab 100644 --- a/.idf_build_apps.toml +++ b/.idf_build_apps.toml @@ -21,13 +21,12 @@ ignore_warning_files = [ build_dir = "build_@t_@w" build_log_filename = "build_log.txt" -size_json_filename = "size.json" +size_json_filename = "size_${CI_JOB_ID}.json" verbose = 1 # INFO # collect collect_app_info_filename = "app_info_${CI_JOB_NAME_SLUG}.txt" -collect_size_info_filename = "size_info_${CI_JOB_NAME_SLUG}.txt" # TODO remove this file when ci-dashboard is ready junitxml = "build_summary_${CI_JOB_NAME_SLUG}.xml" # manifest diff --git a/.idf_ci.toml b/.idf_ci.toml index 84fdd0d9ad..cc97333f84 100644 --- a/.idf_ci.toml +++ b/.idf_ci.toml @@ -74,7 +74,7 @@ patterns = [ bucket = "idf-artifacts" patterns = [ '**/build*/build_log.txt', - '**/build*/size.json', + '**/build*/size*.json', ] [gitlab.artifacts.s3.junit] diff --git a/tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml b/tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml index 14596eebbf..f42e7c8bbb 100644 --- a/tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml +++ b/tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml @@ -82,7 +82,7 @@ # CI specific options start from "--known-failure-cases-file xxx". could ignore when running locally - run_cmd pytest $nodes --pipeline-id $PARENT_PIPELINE_ID - --junitxml=XUNIT_RESULT_${CI_JOB_NAME_SLUG}.xml + --junitxml=XUNIT_RESULT_${CI_JOB_ID}.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME} --parallel-count ${CI_NODE_TOTAL:-1} --parallel-index ${CI_NODE_INDEX:-1}