ci: apply idf-ci pytest plugin

Removed

- target markers. Now must use target as parametrization in esp-idf
- host test markers. Now will be automatically added with linux target and qemu marker

Author: hfudev

.gitlab/ci/build.yml

@@ -34,7 +34,6 @@
   variables:
     IDF_TOOLCHAIN: clang
     TEST_BUILD_OPTS_EXTRA: ""
-    PYTEST_IGNORE_COLLECT_IMPORT_ERROR: "1"
   script:
     # CI specific options start from "--parallel-count xxx". could ignore when running locally
     - run_cmd idf-build-apps build
@@ -292,8 +291,6 @@ generate_build_child_pipeline:
       - non_test_related_apps.txt
     expire_in: 1 week
     when: always
-  variables:
-    PYTEST_IGNORE_COLLECT_IMPORT_ERROR: "1"
   script:
     - run_cmd python tools/ci/dynamic_pipelines/scripts/generate_build_child_pipeline.py
 

.gitlab/ci/common.yml

@@ -145,6 +145,7 @@ variables:
     export IDF_PIP_WHEELS_URL=""
   fi
 
+  # install.sh
   if [[ "${CI_JOB_STAGE}" != "target_test" ]]; then
     section_start "running_install_sh" "Running install.sh"
     if [[ "${CI_JOB_STAGE}" == "build_doc" ]]; then
@@ -154,8 +155,9 @@ variables:
     fi
     section_end "running_install_sh"
   else
-    section_start "install_python_env" "Install Python environment"
+    section_start "install_python_env" "Install Python environment, skip required tools check"
     run_cmd python tools/idf_tools.py install-python-env --features ci,test-specific
+    export IDF_SKIP_TOOLS_CHECK=1
     section_end "install_python_env"
   fi
 
@@ -170,11 +172,6 @@ variables:
     $IDF_PATH/tools/idf_tools.py --non-interactive install esp-clang
   fi
 
-  if [[ "${CI_JOB_STAGE}" == "target_test" ]]; then
-    section_start "IDF_SKIP_TOOLS_CHECK" "Skip required tools check"
-    export IDF_SKIP_TOOLS_CHECK=1
-    section_end "IDF_SKIP_TOOLS_CHECK"
-  fi
   section_start "source_export" "Source export.sh"
   source ./export.sh
   section_end "source_export"

.gitlab/ci/host-test.yml

@@ -353,7 +353,6 @@ test_pytest_macos:
       junit: XUNIT_RESULT.xml
   variables:
     PYENV_VERSION: "3.9"
-    PYTEST_IGNORE_COLLECT_IMPORT_ERROR: "1"
     # Workaround for a bug in Parallels executor where CI_PROJECT_DIR is not an absolute path,
     # but a relative path to the build directory (builds/espressif/esp-idf instead of ~/builds/espressif/esp-idf.
     # GitLab sets the project dir to this template `<builds_dir>/<namespace>/<project_name>`
@@ -364,30 +363,15 @@ test_pytest_macos:
       --build-system cmake
       --target linux
       --only-test-related
-      -m \"host_test and macos\"
+      -m macos
       --modified-files ${MR_MODIFIED_FILES}
     - python tools/ci/get_known_failure_cases_file.py
     - run_cmd pytest
       --target linux
-      -m \"host_test and macos\"
+      -m macos
       --junitxml=XUNIT_RESULT.xml
       --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
 
-test_idf_pytest_plugin:
-  extends:
-    - .host_test_template
-    - .rules:patterns:idf-pytest-plugin
-  variables:
-    SUBMODULES_TO_FETCH: "none"
-  artifacts:
-    reports:
-      junit: XUNIT_RESULT.xml
-  script:
-    - cd ${IDF_PATH}/tools/ci/dynamic_pipelines/tests/test_report_generator
-    - python -m unittest test_report_generator.py
-    - cd ${IDF_PATH}/tools/ci/idf_pytest
-    - pytest --junitxml=${CI_PROJECT_DIR}/XUNIT_RESULT.xml
-
 test_idf_build_apps_load_soc_caps:
   extends: .host_test_template
   script:

.gitlab/ci/pre_check.yml

@@ -116,8 +116,6 @@ check_test_scripts_build_test_rules:
   extends:
     - .pre_check_template
     - .before_script:build
-  variables:
-    PYTEST_IGNORE_COLLECT_IMPORT_ERROR: "1"
   script:
     # requires basic pytest dependencies
     - python tools/ci/check_build_test_rules.py check-test-scripts examples/ tools/test_apps components

.gitlab/ci/rules.yml

@@ -162,10 +162,6 @@
   - "components/bt/esp_ble_mesh/lib/lib"
   - ".gitmodules"
 
-.patterns-idf-pytest-plugin: &patterns-idf-pytest-plugin
-  - "tools/ci/idf_pytest/**/*"
-  - "tools/ci/dynamic_pipelines/tests/**/*"
-
 ##############
 # if anchors #
 ##############
@@ -265,12 +261,6 @@
 #    - <<: *if-dev-push
 #      changes: *patterns-sonarqube-files
 
-.rules:patterns:idf-pytest-plugin:
-  rules:
-    - <<: *if-protected-check
-    - <<: *if-dev-push
-      changes: *patterns-idf-pytest-plugin
-
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # DO NOT place comments or maintain any code from this line
 #

.idf_build_apps.toml

@@ -20,7 +20,7 @@ ignore_warning_files = [
 ]
 
 build_dir = "build_@t_@w"
-build_log_filename = "build.log"
+build_log_filename = "build_log.txt"
 size_json_filename = "size.json"
 
 verbose = 1  # INFO
@@ -31,7 +31,7 @@ collect_size_info_filename = "size_info_${CI_JOB_NAME_SLUG}.txt"  # TODO remove
 junitxml = "build_summary_${CI_JOB_NAME_SLUG}.xml"
 
 # manifest
-# check_manifest_rules = true  # FIXME
+check_manifest_rules = true
 manifest_rootpath = "$IDF_PATH"
 manifest_filepatterns = [
     '**/.build-test-rules.yml',

.pre-commit-config.yaml

@@ -10,26 +10,6 @@ repos:
       - id: ruff-format
       - id: ruff
         args: [ "--fix" ]
-  - repo: local
-    hooks:
-      - id: pytest-linter
-        name: Pytest Linter Check
-        entry: tools/ci/check_test_files.py
-        language: python
-        files: 'pytest_.*\.py$'
-        require_serial: true
-        additional_dependencies:
-          - pytest-embedded-idf[serial]~=1.16
-          - pytest-embedded-jtag~=1.16
-          - pytest-embedded-qemu~=1.16
-          - pytest-ignore-test-results~=0.3
-          - pytest-rerunfailures
-          - pytest-timeout
-          - idf-build-apps~=2.11
-          - python-gitlab
-          - minio
-          - click
-          - esp-idf-monitor
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
@@ -178,15 +158,6 @@ repos:
         files: 'tools/ci/sort_yaml\.py$'
         additional_dependencies:
           - ruamel.yaml
-      - id: check-build-test-rules-path-exists
-        name: check path in .build-test-rules.yml exists
-        entry: tools/ci/check_build_test_rules.py check-exist
-        language: python
-        additional_dependencies:
-          - PyYAML == 5.3.1
-        always_run: true
-        pass_filenames: false
-        require_serial: true
       - id: cleanup-ignore-lists
         name: Remove non-existing patterns from ignore lists
         entry: tools/ci/cleanup_ignore_lists.py

components/esp_mm/test_apps/mm/pytest_mmap.py

@@ -3,6 +3,7 @@
 import pytest
 from pytest_embedded import Dut
 from pytest_embedded_idf.utils import idf_parametrize
+
 # normal mmu tests
 
 
@@ -20,14 +21,6 @@ def test_mmap(dut: Dut) -> None:
 
 
 # mmu tests with psram enabled
-PSRAM_RELEASE_CONFIGS = [
-    pytest.param('psram_release_esp32', marks=[pytest.mark.esp32]),
-    pytest.param('psram_release_esp32s2', marks=[pytest.mark.esp32s2]),
-    pytest.param('psram_release_esp32s3', marks=[pytest.mark.esp32s3]),
-    pytest.param('psram_release_esp32p4', marks=[pytest.mark.esp32p4]),
-]
-
-
 @pytest.mark.generic
 @idf_parametrize(
     'config,target',
@@ -44,12 +37,6 @@ def test_mmap_psram(dut: Dut) -> None:
 
 
 # mmu tests with xip_psram
-XIP_CONFIGS = [
-    pytest.param('xip_psram_esp32s2', marks=[pytest.mark.esp32s2]),
-    pytest.param('xip_psram_esp32s3', marks=[pytest.mark.esp32s3]),
-]
-
-
 @pytest.mark.generic
 @idf_parametrize(
     'config,target', [('xip_psram_esp32s2', 'esp32s2'), ('xip_psram_esp32s3', 'esp32s3')], indirect=['config', 'target']

components/esp_system/test_apps/console/pytest_esp_system_console_tests.py

@@ -15,17 +15,6 @@ def not_expect(dut: Dut, output_regex: str) -> None:
         raise RuntimeError(f'Found not_expect output {output_regex}')
 
 
-JTAG_SERIAL_MARKS = [
-    pytest.mark.esp32s3,
-    pytest.mark.esp32c2,
-    pytest.mark.esp32c3,
-    pytest.mark.esp32c5,
-    pytest.mark.esp32c6,
-    pytest.mark.esp32c61,
-    pytest.mark.esp32h2,
-]
-
-
 @pytest.mark.generic
 @idf_parametrize('config', ['console_none'], indirect=['config'])
 @idf_parametrize('target', ['supported_targets'], indirect=['target'])

components/esp_wifi/test_apps/wifi_function/pytest_wifi_function.py

@@ -3,7 +3,6 @@
 import pytest
 from pytest_embedded import Dut
 from pytest_embedded_idf.utils import idf_parametrize
-# @pytest.mark.esp32c2  # esp32c2 are using xtal_26mhz
 
 
 @pytest.mark.generic