espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: Move upload artifacts execution of build and target_test stages to the after script section

Browse Source
This commit is contained in:
Aleksei Apaseev
2023-11-03 18:09:34 +08:00
committed by Fu Hanxi
parent 21b06f43bf
commit e6a4ad3d55
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab/ci/common.yml
View File

@ -172,6 +172,12 @@ variables:
# Show ccache statistics if enabled globally # Show ccache statistics if enabled globally
test "$CI_CCACHE_STATS" == 1 && test -n "$(which ccache)" && ccache --show-stats || true test "$CI_CCACHE_STATS" == 1 && test -n "$(which ccache)" && ccache --show-stats || true
.upload_failed_job_log_artifacts: &upload_failed_job_log_artifacts |
- |
if [ $CI_JOB_STATUS = "failed" ]; then
python tools/ci/artifacts_handler.py upload --type logs
fi
.before_script:minimal: .before_script:minimal:
before_script: before_script:
- *common-before_scripts - *common-before_scripts
@ -198,6 +204,7 @@ variables:
.after_script:build:ccache: .after_script:build:ccache:
after_script: after_script:
- *show_ccache_statistics - *show_ccache_statistics
- *upload_failed_job_log_artifacts
############################## ##############################
# Git Strategy Job Templates # # Git Strategy Job Templates #

6
.gitlab/ci/target-test.yml
View File

@ -11,6 +11,8 @@
paths: paths:
- .cache/pip - .cache/pip
policy: pull policy: pull
after_script:
- python tools/ci/artifacts_handler.py upload --type logs junit_reports
.pytest_template: .pytest_template:
extends: extends:
@ -49,7 +51,6 @@
--parallel-index ${CI_NODE_INDEX:-1} --parallel-index ${CI_NODE_INDEX:-1}
${PYTEST_EXTRA_FLAGS} ${PYTEST_EXTRA_FLAGS}
--app-info-filepattern \"list_job_*.txt\" --app-info-filepattern \"list_job_*.txt\"
- python tools/ci/artifacts_handler.py upload --type logs junit_reports
.pytest_examples_dir_template: .pytest_examples_dir_template:
extends: .pytest_template extends: .pytest_template
@ -1298,7 +1299,6 @@ pytest_examples_openthread_br:
--parallel-index ${CI_NODE_INDEX:-1} --parallel-index ${CI_NODE_INDEX:-1}
${PYTEST_EXTRA_FLAGS} ${PYTEST_EXTRA_FLAGS}
--app-info-filepattern \"list_job_*.txt\" --app-info-filepattern \"list_job_*.txt\"
- python tools/ci/artifacts_handler.py upload --type logs junit_reports
pytest_examples_openthread_bbr: pytest_examples_openthread_bbr:
extends: extends:
@ -1333,7 +1333,6 @@ pytest_examples_openthread_bbr:
--parallel-index ${CI_NODE_INDEX:-1} --parallel-index ${CI_NODE_INDEX:-1}
${PYTEST_EXTRA_FLAGS} ${PYTEST_EXTRA_FLAGS}
--app-info-filepattern \"list_job_*.txt\" --app-info-filepattern \"list_job_*.txt\"
- python tools/ci/artifacts_handler.py upload --type logs junit_reports
pytest_examples_openthread_sleep: pytest_examples_openthread_sleep:
extends: extends:
@ -1365,7 +1364,6 @@ pytest_examples_openthread_sleep:
--parallel-index ${CI_NODE_INDEX:-1} --parallel-index ${CI_NODE_INDEX:-1}
${PYTEST_EXTRA_FLAGS} ${PYTEST_EXTRA_FLAGS}
--app-info-filepattern \"list_job_*.txt\" --app-info-filepattern \"list_job_*.txt\"
- python tools/ci/artifacts_handler.py upload --type logs junit_reports
pytest_examples_esp32h2_zigbee: pytest_examples_esp32h2_zigbee:
extends: extends: