From 87a5aedb850057d9ec6daaa763bf1ad38c306ca1 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Tue, 3 Jun 2025 08:37:30 +0200 Subject: [PATCH] ci: disable idf-ci plugin this plugin will be re-enabled with compatible code in !38755 --- components/nvs_flash/nvs_partition_tool/pytest.ini | 2 +- pytest.ini | 1 + tools/ci/idf_pytest/pytest.ini | 1 + tools/ci/test_autocomplete/pytest.ini | 2 +- tools/test_bsasm/pytest.ini | 2 +- tools/test_build_system/pytest.ini | 1 + tools/test_idf_diag/pytest.ini | 2 +- tools/test_idf_py/pytest.ini | 2 +- tools/test_idf_size/pytest.ini | 2 +- tools/test_mkdfu/pytest.ini | 2 +- 10 files changed, 10 insertions(+), 7 deletions(-) diff --git a/components/nvs_flash/nvs_partition_tool/pytest.ini b/components/nvs_flash/nvs_partition_tool/pytest.ini index d95e773e5c..8cb59810c3 100644 --- a/components/nvs_flash/nvs_partition_tool/pytest.ini +++ b/components/nvs_flash/nvs_partition_tool/pytest.ini @@ -1,5 +1,5 @@ [pytest] -addopts = -s -p no:pytest_embedded +addopts = -s -p no:pytest_embedded -p no:idf-ci # log related log_cli = True diff --git a/pytest.ini b/pytest.ini index 069d1cf415..1fe5e78cc6 100644 --- a/pytest.ini +++ b/pytest.ini @@ -7,6 +7,7 @@ python_files = pytest_*.py addopts = -s -vv --embedded-services esp,idf + -p no:idf-ci --tb short --strict-markers --skip-check-coredump y diff --git a/tools/ci/idf_pytest/pytest.ini b/tools/ci/idf_pytest/pytest.ini index 0ee949b898..cc928df899 100644 --- a/tools/ci/idf_pytest/pytest.ini +++ b/tools/ci/idf_pytest/pytest.ini @@ -1,2 +1,3 @@ [pytest] +addopts = -p no:idf-ci python_files = test_*.py diff --git a/tools/ci/test_autocomplete/pytest.ini b/tools/ci/test_autocomplete/pytest.ini index d95e773e5c..8cb59810c3 100644 --- a/tools/ci/test_autocomplete/pytest.ini +++ b/tools/ci/test_autocomplete/pytest.ini @@ -1,5 +1,5 @@ [pytest] -addopts = -s -p no:pytest_embedded +addopts = -s -p no:pytest_embedded -p no:idf-ci # log related log_cli = True diff --git a/tools/test_bsasm/pytest.ini b/tools/test_bsasm/pytest.ini index d95e773e5c..8cb59810c3 100644 --- a/tools/test_bsasm/pytest.ini +++ b/tools/test_bsasm/pytest.ini @@ -1,5 +1,5 @@ [pytest] -addopts = -s -p no:pytest_embedded +addopts = -s -p no:pytest_embedded -p no:idf-ci # log related log_cli = True diff --git a/tools/test_build_system/pytest.ini b/tools/test_build_system/pytest.ini index fe058544ee..eeac16e6d7 100644 --- a/tools/test_build_system/pytest.ini +++ b/tools/test_build_system/pytest.ini @@ -1,4 +1,5 @@ [pytest] +addopts = -p no:idf-ci # log related log_cli = True diff --git a/tools/test_idf_diag/pytest.ini b/tools/test_idf_diag/pytest.ini index d95e773e5c..8cb59810c3 100644 --- a/tools/test_idf_diag/pytest.ini +++ b/tools/test_idf_diag/pytest.ini @@ -1,5 +1,5 @@ [pytest] -addopts = -s -p no:pytest_embedded +addopts = -s -p no:pytest_embedded -p no:idf-ci # log related log_cli = True diff --git a/tools/test_idf_py/pytest.ini b/tools/test_idf_py/pytest.ini index d95e773e5c..8cb59810c3 100644 --- a/tools/test_idf_py/pytest.ini +++ b/tools/test_idf_py/pytest.ini @@ -1,5 +1,5 @@ [pytest] -addopts = -s -p no:pytest_embedded +addopts = -s -p no:pytest_embedded -p no:idf-ci # log related log_cli = True diff --git a/tools/test_idf_size/pytest.ini b/tools/test_idf_size/pytest.ini index d95e773e5c..8cb59810c3 100644 --- a/tools/test_idf_size/pytest.ini +++ b/tools/test_idf_size/pytest.ini @@ -1,5 +1,5 @@ [pytest] -addopts = -s -p no:pytest_embedded +addopts = -s -p no:pytest_embedded -p no:idf-ci # log related log_cli = True diff --git a/tools/test_mkdfu/pytest.ini b/tools/test_mkdfu/pytest.ini index d95e773e5c..8cb59810c3 100644 --- a/tools/test_mkdfu/pytest.ini +++ b/tools/test_mkdfu/pytest.ini @@ -1,5 +1,5 @@ [pytest] -addopts = -s -p no:pytest_embedded +addopts = -s -p no:pytest_embedded -p no:idf-ci # log related log_cli = True