diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index 331280081e..0cf72a4f15 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -116,7 +116,6 @@ - *all_targets - - wifi # pytest*wifi* - ethernet # pytest*ethernet* - - sdio # pytest*sdio* patterns: - "{0}-{1}-{2}" - "{0}-{2}" diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 7bc226eb5d..e7159bf91c 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -221,33 +221,6 @@ .patterns-custom_test-wifi: &patterns-custom_test-wifi - "tools/test_apps/phy/**/*" -# for jobs: SDIO related example_test -.patterns-example_test-sdio: &patterns-example_test-sdio - - "components/hal/sdio*.c" - - "components/hal/include/hal/sdio*.h" - - "components/esp_driver_sdspi/src/sdspi*.c" - - "components/esp_driver_sdio/src/sdio*.c" - - "components/esp_driver_sdmmc/src/sdmmc*.c" - - "components/esp_driver_sdspi/include/driver/sdspi*.h" - - "components/esp_driver_sdio/include/driver/sdio*.h" - - "components/esp_driver_sdmmc/include/driver/sdmmc*.h" - - "components/sdmmc/??[!s][!t]*/**/*" - - "components/sdmmc/???/**/*" - - "components/sdmmc/*" - - "examples/peripherals/sdio/**/*" - -# for jobs: SDIO related component_test -.patterns-component_ut-sdio: &patterns-component_ut-sdio - - "components/hal/sdio*.c" - - "components/hal/include/hal/sdio*.h" - - "components/esp_driver_sdspi/src/sdspi*.c" - - "components/esp_driver_sdio/src/sdio*.c" - - "components/esp_driver_sdmmc/src/sdmmc*.c" - - "components/esp_driver_sdspi/include/driver/sdspi*.h" - - "components/esp_driver_sdio/include/driver/sdio*.h" - - "components/esp_driver_sdmmc/include/driver/sdmmc*.h" - - "components/sdmmc/**/*" - ############## # if anchors # ############## @@ -1541,8 +1514,6 @@ changes: *patterns-build_template-app - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-sdio - <<: *if-dev-push changes: *patterns-component_ut-wifi - <<: *if-dev-push @@ -1555,8 +1526,6 @@ changes: *patterns-example_test - <<: *if-dev-push changes: *patterns-example_test-ethernet - - <<: *if-dev-push - changes: *patterns-example_test-sdio - <<: *if-dev-push changes: *patterns-example_test-wifi - <<: *if-dev-push @@ -1588,19 +1557,6 @@ - <<: *if-dev-push changes: *patterns-component_ut -.rules:test:component_ut-esp32-sdio: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-component_ut - - <<: *if-label-component_ut_esp32 - - <<: *if-label-target_test - - <<: *if-dev-push - changes: *patterns-component_ut-sdio - .rules:test:component_ut-esp32c2: rules: - <<: *if-revert-branch @@ -1642,19 +1598,6 @@ - <<: *if-dev-push changes: *patterns-component_ut -.rules:test:component_ut-esp32c3-sdio: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-component_ut - - <<: *if-label-component_ut_esp32c3 - - <<: *if-label-target_test - - <<: *if-dev-push - changes: *patterns-component_ut-sdio - .rules:test:component_ut-esp32c3-wifi: rules: - <<: *if-revert-branch @@ -1722,19 +1665,6 @@ - <<: *if-dev-push changes: *patterns-component_ut -.rules:test:component_ut-esp32s2-sdio: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-component_ut - - <<: *if-label-component_ut_esp32s2 - - <<: *if-label-target_test - - <<: *if-dev-push - changes: *patterns-component_ut-sdio - .rules:test:component_ut-esp32s3: rules: - <<: *if-revert-branch @@ -1964,19 +1894,6 @@ when: never - <<: *if-example_test-ota-include_nightly_run-rule -.rules:test:example_test-esp32-sdio: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-example_test - - <<: *if-label-example_test_esp32 - - <<: *if-label-target_test - - <<: *if-dev-push - changes: *patterns-example_test-sdio - .rules:test:example_test-esp32-wifi: rules: - <<: *if-revert-branch @@ -2046,19 +1963,6 @@ when: never - <<: *if-example_test-ota-include_nightly_run-rule -.rules:test:example_test-esp32c3-sdio: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-example_test - - <<: *if-label-example_test_esp32c3 - - <<: *if-label-target_test - - <<: *if-dev-push - changes: *patterns-example_test-sdio - .rules:test:example_test-esp32c3-wifi: rules: - <<: *if-revert-branch @@ -2149,19 +2053,6 @@ - <<: *if-dev-push changes: *patterns-example_test -.rules:test:example_test-esp32s2-sdio: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-example_test - - <<: *if-label-example_test_esp32s2 - - <<: *if-label-target_test - - <<: *if-dev-push - changes: *patterns-example_test-sdio - .rules:test:example_test-esp32s2-wifi: rules: - <<: *if-revert-branch diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index 95ec6630e1..11d0b8173e 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -127,14 +127,6 @@ pytest_examples_esp32_ccs811: artifacts: false tags: [ esp32, ccs811 ] -pytest_examples_esp32_sdio: - extends: - - .pytest_examples_dir_template - - .rules:test:example_test-esp32-sdio - needs: - - job: build_pytest_examples_esp32 - artifacts: false - tags: [ esp32, sdio_master_slave ] pytest_examples_esp32s2_generic: extends: @@ -553,33 +545,6 @@ pytest_examples_esp32_sdmmc: artifacts: false tags: [ esp32, sdcard_sdmode ] -pytest_examples_esp32_sdspi: - extends: - - .pytest_examples_dir_template - - .rules:test:example_test-esp32-sdio - needs: - - job: build_pytest_examples_esp32 - artifacts: false - tags: [ esp32, sdcard_spimode ] - -pytest_examples_esp32s2_sdspi: - extends: - - .pytest_examples_dir_template - - .rules:test:example_test-esp32s2-sdio - needs: - - job: build_pytest_examples_esp32s2 - artifacts: false - tags: [ esp32s2, sdcard_spimode ] - -pytest_examples_esp32c3_sdspi: - extends: - - .pytest_examples_dir_template - - .rules:test:example_test-esp32c3-sdio - needs: - - job: build_pytest_examples_esp32c3 - artifacts: false - tags: [ esp32c3, sdcard_spimode ] - pytest_examples_esp32_extflash: extends: - .pytest_examples_dir_template @@ -650,46 +615,6 @@ pytest_components_esp32s3_sdmmc: artifacts: false tags: [ esp32s3, sdcard ] -pytest_components_esp32_sdio: - extends: - - .pytest_components_dir_template - - .rules:test:component_ut-esp32-sdio - needs: - - job: build_pytest_components_esp32 - artifacts: false - tags: [ esp32, sdio_master_slave ] - -pytest_components_esp32_esp32c6_sdio: - extends: - - .pytest_components_dir_template - - .rules:test:component_ut-esp32-sdio - needs: - - job: build_pytest_components_esp32 - artifacts: false - - job: build_pytest_components_esp32c6 - artifacts: false - tags: [ esp32c6, sdio_multidev_32_c6 ] - script: - - retry_failed git clone $KNOWN_FAILURE_CASES_REPO known_failure_cases - # get runner env config file - - retry_failed git clone $TEST_ENV_CONFIG_REPO - - python $CHECKOUT_REF_SCRIPT ci-test-runner-configs ci-test-runner-configs - # using runner tags as markers to filter the test cases - # Runner tags are comma separated, replace the comma with " and " for markers - - job_tags=$(python tools/ci/python_packages/gitlab_api.py get_job_tags $CI_PROJECT_ID --job_id $CI_JOB_ID) - - markers=$(echo $job_tags | sed -e "s/,/ and /g") - # download the artifacts, requires esp32 and esp32c6 chips - - run_cmd python tools/ci/artifacts_handler.py download --job-name "build_pytest_components_esp32" - - run_cmd python tools/ci/artifacts_handler.py download --job-name "build_pytest_components_esp32c6" - - run_cmd pytest $TEST_DIR - -m \"${markers}\" - --junitxml=XUNIT_RESULT.xml - --ignore-result-files known_failure_cases/known_failure_cases.txt - --parallel-count ${CI_NODE_TOTAL:-1} - --parallel-index ${CI_NODE_INDEX:-1} - ${PYTEST_EXTRA_FLAGS} - --app-info-filepattern \"list_job_*.txt\" - pytest_components_esp32_lan8720: extends: - .pytest_components_dir_template @@ -1016,32 +941,6 @@ pytest_components_esp32c3_flash_encryption: artifacts: false tags: [ esp32c3, flash_encryption ] -pytest_components_esp32_sdspi: - extends: - - .pytest_components_dir_template - - .rules:test:component_ut-esp32-sdio - needs: - - job: build_pytest_components_esp32 - artifacts: false - tags: [ esp32, sdcard_spimode ] - -pytest_components_esp32s2_sdspi: - extends: - - .pytest_components_dir_template - - .rules:test:component_ut-esp32s2-sdio - needs: - - job: build_pytest_components_esp32s2 - artifacts: false - tags: [ esp32s2, sdcard_spimode ] - -pytest_components_esp32c3_sdspi: - extends: - - .pytest_components_dir_template - - .rules:test:component_ut-esp32c3-sdio - needs: - - job: build_pytest_components_esp32c3 - artifacts: false - tags: [ esp32c3, sdcard_spimode ] pytest_components_esp32c6_generic: extends: diff --git a/components/fatfs/test_apps/.build-test-rules.yml b/components/fatfs/test_apps/.build-test-rules.yml index 0a1970ea43..552ed42304 100644 --- a/components/fatfs/test_apps/.build-test-rules.yml +++ b/components/fatfs/test_apps/.build-test-rules.yml @@ -28,12 +28,10 @@ components/fatfs/test_apps/sdcard: - if: IDF_TARGET == "esp32p4" temporary: true reason: target esp32p4 is not supported yet # TODO: IDF-7501 - disable_test: - if: IDF_TARGET not in ["esp32", "esp32c3"] temporary: true reason: lack of runners - depends_components: - esp_driver_sdmmc - esp_driver_spi