Skip to content

Commit fc4b2fb

Browse files
committed
Merge branch 'ci/disable-plugin-idf_ci' into 'master'
ci: disable idf-ci plugin See merge request espressif/esp-idf!39600
2 parents 7d25722 + 87a5aed commit fc4b2fb

File tree

10 files changed

+10
-7
lines changed

10 files changed

+10
-7
lines changed

components/nvs_flash/nvs_partition_tool/pytest.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[pytest]
2-
addopts = -s -p no:pytest_embedded
2+
addopts = -s -p no:pytest_embedded -p no:idf-ci
33

44
# log related
55
log_cli = True

pytest.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ python_files = pytest_*.py
77
addopts =
88
-s -vv
99
--embedded-services esp,idf
10+
-p no:idf-ci
1011
--tb short
1112
--strict-markers
1213
--skip-check-coredump y

tools/ci/idf_pytest/pytest.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[pytest]
2+
addopts = -p no:idf-ci
23
python_files = test_*.py

tools/ci/test_autocomplete/pytest.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[pytest]
2-
addopts = -s -p no:pytest_embedded
2+
addopts = -s -p no:pytest_embedded -p no:idf-ci
33

44
# log related
55
log_cli = True

tools/test_bsasm/pytest.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[pytest]
2-
addopts = -s -p no:pytest_embedded
2+
addopts = -s -p no:pytest_embedded -p no:idf-ci
33

44
# log related
55
log_cli = True

tools/test_build_system/pytest.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[pytest]
2+
addopts = -p no:idf-ci
23

34
# log related
45
log_cli = True

tools/test_idf_diag/pytest.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[pytest]
2-
addopts = -s -p no:pytest_embedded
2+
addopts = -s -p no:pytest_embedded -p no:idf-ci
33

44
# log related
55
log_cli = True

tools/test_idf_py/pytest.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[pytest]
2-
addopts = -s -p no:pytest_embedded
2+
addopts = -s -p no:pytest_embedded -p no:idf-ci
33

44
# log related
55
log_cli = True

tools/test_idf_size/pytest.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[pytest]
2-
addopts = -s -p no:pytest_embedded
2+
addopts = -s -p no:pytest_embedded -p no:idf-ci
33

44
# log related
55
log_cli = True

tools/test_mkdfu/pytest.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[pytest]
2-
addopts = -s -p no:pytest_embedded
2+
addopts = -s -p no:pytest_embedded -p no:idf-ci
33

44
# log related
55
log_cli = True

0 commit comments

Comments
 (0)