Skip to content

Commit

Permalink
Merge branch 'ci/fix_skipping_qemu_test' into 'master'
Browse files Browse the repository at this point in the history
CI: fix skipping qemu test

See merge request espressif/esp-idf!24880
  • Loading branch information
hfudev committed Jul 19, 2023
2 parents b488cb7 + f5984d4 commit 4a8c9ec
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
13 changes: 4 additions & 9 deletions .gitlab/ci/host-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
image: $ESP_ENV_IMAGE
tags:
- host_test
dependencies: []
dependencies: # set dependencies to null to avoid missing artifacts issue
# run host_test jobs immediately, only after upload cache
needs:
- job: upload-pip-cache
Expand All @@ -13,6 +13,8 @@
- job: upload-submodules-cache
optional: true
artifacts: false
- job: mr_variables
optional: true # only MR pipelines would have this

test_nvs_on_host:
extends: .host_test_template
Expand Down Expand Up @@ -98,7 +100,6 @@ test_gdbstub_on_host:
- cd components/esp_gdbstub/test_gdbstub_host
- make test


test_idf_py:
extends: .host_test_template
variables:
Expand Down Expand Up @@ -301,9 +302,6 @@ test_pytest_qemu:
- .host_test_template
- .before_script_build_jobs
image: $QEMU_IMAGE
needs:
- job: mr_variables
optional: true # only MR pipelines would have this
artifacts:
when: always
paths:
Expand All @@ -325,7 +323,7 @@ test_pytest_qemu:
--modified-components ${MR_MODIFIED_COMPONENTS}
--modified-files ${MR_MODIFIED_FILES}
- retry_failed git clone $KNOWN_FAILURE_CASES_REPO known_failure_cases
- pytest
- run_cmd pytest
--target $IDF_TARGET
-m qemu
--embedded-services idf,qemu
Expand All @@ -337,9 +335,6 @@ test_pytest_linux:
extends:
- .host_test_template
- .before_script_build_jobs
needs:
- job: mr_variables
optional: true # only MR pipelines would have this
artifacts:
when: always
paths:
Expand Down
1 change: 1 addition & 0 deletions .gitlab/ci/pre_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ mr_variables:
if echo "$CI_MERGE_REQUEST_LABELS" | egrep "(^|,)BUILD_AND_TEST_ALL_APPS(,|$)"; then
echo "BUILD_AND_TEST_ALL_APPS=1" >> mr.env
fi
- cat mr.env
artifacts:
reports:
dotenv: mr.env
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/idf_ci_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def get_pytest_files(paths: List[str]) -> List[str]:
pytest_scripts: Set[str] = set()
for p in paths:
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)

Expand Down

0 comments on commit 4a8c9ec

Please sign in to comment.