From 7df85741194eaf224760ccde8e709742cf54c6d1 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Thu, 30 Nov 2023 09:07:36 +0100 Subject: [PATCH 1/2] ci: fix missing linux related .build-test-rules.yml --- components/esp_event/.build-test-rules.yml | 5 +++++ components/esp_rom/.build-test-rules.yml | 10 +++++----- components/nvs_flash/host_test/.build-test-rules.yml | 4 ++++ 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 components/nvs_flash/host_test/.build-test-rules.yml diff --git a/components/esp_event/.build-test-rules.yml b/components/esp_event/.build-test-rules.yml index eb6a06f0c2..f928409861 100644 --- a/components/esp_event/.build-test-rules.yml +++ b/components/esp_event/.build-test-rules.yml @@ -1,5 +1,10 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps +components/esp_event/host_test/esp_event_unit_test: + enable: + - if: IDF_TARGET == "linux" + reason: only test on linux + components/esp_event/test_apps: enable: - if: IDF_TARGET in ["esp32", "esp32s2", "esp32c3"] diff --git a/components/esp_rom/.build-test-rules.yml b/components/esp_rom/.build-test-rules.yml index 8a19709b18..7bc39d1f09 100644 --- a/components/esp_rom/.build-test-rules.yml +++ b/components/esp_rom/.build-test-rules.yml @@ -1,12 +1,12 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps -components/esp_rom/host_test/rom_test: - enable: - - if: IDF_TARGET == "linux" - reason: only test on linux - components/esp_rom/test_apps: disable_test: - if: IDF_TARGET in ["esp32", "esp32c2"] temporary: false reason: lack of memory for testing miniz compressing + +components/esp_rom/test_apps/linux_rom_apis: + enable: + - if: IDF_TARGET == "linux" + reason: only test on linux diff --git a/components/nvs_flash/host_test/.build-test-rules.yml b/components/nvs_flash/host_test/.build-test-rules.yml new file mode 100644 index 0000000000..ff35a2d578 --- /dev/null +++ b/components/nvs_flash/host_test/.build-test-rules.yml @@ -0,0 +1,4 @@ +components/nvs_flash/host_test: + enable: + - if: IDF_TARGET == "linux" + reason: only test on linux From 1f0f66197978167ea77d7cc3e1ef4ae94f88f45a Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Thu, 30 Nov 2023 09:08:01 +0100 Subject: [PATCH 2/2] ci: skip pytest cases in managed_components --- pytest.ini | 1 + tools/ci/idf_ci_utils.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pytest.ini b/pytest.ini index ffc14c7019..70acd73394 100644 --- a/pytest.ini +++ b/pytest.ini @@ -12,6 +12,7 @@ addopts = --skip-check-coredump y --logfile-extension ".txt" --check-duplicates y + --ignore-glob "*/managed_components/*" # ignore DeprecationWarning filterwarnings = diff --git a/tools/ci/idf_ci_utils.py b/tools/ci/idf_ci_utils.py index 6bd4a45d49..c8335a738d 100644 --- a/tools/ci/idf_ci_utils.py +++ b/tools/ci/idf_ci_utils.py @@ -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)