feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'ci/fix_skipping_qemu_test' into 'master'

Browse Source 
CI: fix skipping qemu test

See merge request espressif/esp-idf!24880
This commit is contained in:
Fu Hanxi
2023-07-19 15:06:06 +08:00
parent b488cb70e7 f5984d482a
commit 4a8c9ecb60
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.gitlab/ci/host-test.yml
View File

@@ -4,7 +4,7 @@
image: $ESP_ENV_IMAGE image: $ESP_ENV_IMAGE
tags: tags:
- host_test - host_test
dependencies: [] dependencies: # set dependencies to null to avoid missing artifacts issue
# run host_test jobs immediately, only after upload cache # run host_test jobs immediately, only after upload cache
needs: needs:
- job: upload-pip-cache - job: upload-pip-cache
@@ -13,6 +13,8 @@
- job: upload-submodules-cache - job: upload-submodules-cache
optional: true optional: true
artifacts: false artifacts: false
- job: mr_variables
optional: true # only MR pipelines would have this
test_nvs_on_host: test_nvs_on_host:
extends: .host_test_template extends: .host_test_template
@@ -98,7 +100,6 @@ test_gdbstub_on_host:
- cd components/esp_gdbstub/test_gdbstub_host - cd components/esp_gdbstub/test_gdbstub_host
- make test - make test
test_idf_py: test_idf_py:
extends: .host_test_template extends: .host_test_template
variables: variables:
@@ -301,9 +302,6 @@ test_pytest_qemu:
- .host_test_template - .host_test_template
- .before_script_build_jobs - .before_script_build_jobs
image: $QEMU_IMAGE image: $QEMU_IMAGE
needs:
- job: mr_variables
optional: true # only MR pipelines would have this
artifacts: artifacts:
when: always when: always
paths: paths:
@@ -325,7 +323,7 @@ test_pytest_qemu:
--modified-components ${MR_MODIFIED_COMPONENTS} --modified-components ${MR_MODIFIED_COMPONENTS}
--modified-files ${MR_MODIFIED_FILES} --modified-files ${MR_MODIFIED_FILES}
- retry_failed git clone $KNOWN_FAILURE_CASES_REPO known_failure_cases - retry_failed git clone $KNOWN_FAILURE_CASES_REPO known_failure_cases
- pytest - run_cmd pytest
--target $IDF_TARGET --target $IDF_TARGET
-m qemu -m qemu
--embedded-services idf,qemu --embedded-services idf,qemu
@@ -337,9 +335,6 @@ test_pytest_linux:
extends: extends:
- .host_test_template - .host_test_template
- .before_script_build_jobs - .before_script_build_jobs
needs:
- job: mr_variables
optional: true # only MR pipelines would have this
artifacts: artifacts:
when: always when: always
paths: paths:

1
.gitlab/ci/pre_check.yml
View File

@@ -201,6 +201,7 @@ mr_variables:
if echo "$CI_MERGE_REQUEST_LABELS" | egrep "(^|,)BUILD_AND_TEST_ALL_APPS(,|$)"; then if echo "$CI_MERGE_REQUEST_LABELS" | egrep "(^|,)BUILD_AND_TEST_ALL_APPS(,|$)"; then
echo "BUILD_AND_TEST_ALL_APPS=1" >> mr.env echo "BUILD_AND_TEST_ALL_APPS=1" >> mr.env
fi fi
- cat mr.env
artifacts: artifacts:
reports: reports:
dotenv: mr.env dotenv: mr.env

2
tools/ci/idf_ci_utils.py
View File

@@ -214,7 +214,7 @@ def get_pytest_files(paths: List[str]) -> List[str]:
pytest_scripts: Set[str] = set() pytest_scripts: Set[str] = set()
for p in paths: for p in paths:
path = Path(p) path = Path(p)
pytest_scripts.update(str(_p) for _p in path.glob('**/pytest_*.py')) pytest_scripts.update(str(_p) for _p in path.glob('**/pytest_*.py') if 'managed_components' not in _p.parts)
return list(pytest_scripts) return list(pytest_scripts)