Skip to content

Commit ad29ffc

Browse files
committed
Merge branch 'ci/enable-junit-report-in-mr_v6.0' into 'release/v6.0'
ci: enable junit report in MR (v6.0) See merge request espressif/esp-idf!43290
2 parents 925b377 + ceb4266 commit ad29ffc

18 files changed

+52
-8756
lines changed

.gitlab/ci/deploy.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,21 @@ deploy_update_SHA_in_esp-dockerfiles:
6464
environment:
6565
name: deploy_update_SHA_in_esp-dockerfiles_production
6666
deployment_tier: production
67+
68+
upload_junit_report:
69+
extends:
70+
- .deploy_job_template
71+
tags: [ fast_run, shiny ]
72+
needs:
73+
- pipeline_variables
74+
- job: build_child_pipeline
75+
artifacts: false
76+
script:
77+
- run_cmd idf-ci gitlab download-artifacts --type junit
78+
rules:
79+
- when: always
80+
artifacts:
81+
reports:
82+
junit: XUNIT_RESULT_*.xml
83+
expire_in: 1 week
84+
when: always

.gitlab/ci/post_deploy.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ generate_failed_jobs_report:
77
- .post_deploy_template
88
tags: [build, shiny]
99
when: always
10-
dependencies: [] # Do not download artifacts from the previous stages
10+
dependencies: # Do not download artifacts from the previous stages
11+
needs:
12+
- pipeline_variables
1113
artifacts:
1214
expire_in: 2 week
1315
when: always

.idf_ci.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ pre_yaml_jinja = """
4848
include:
4949
- .gitlab/ci/common.yml
5050
- tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml
51-
- tools/ci/dynamic_pipelines/templates/generate_target_test_report.yml
5251
"""
5352

5453
[gitlab.artifacts.s3.debug]
@@ -89,13 +88,13 @@ patterns = [
8988
[gitlab.artifacts.s3.junit]
9089
bucket = "idf-artifacts"
9190
patterns = [
92-
'XUNIT_RESULT_*.xml',
91+
'**/XUNIT_RESULT_*.xml',
9392
]
9493

9594
[gitlab.artifacts.s3.env]
9695
bucket = "idf-artifacts"
9796
patterns = [
98-
'pipeline.env',
97+
'**/pipeline.env',
9998
]
10099

101100
[gitlab.artifacts.s3.longterm]

0 commit comments

Comments
 (0)