Merge branch 'bugfix/idfci-8839-remove-orphan-test-configs_v6.0' into 'release/v6.0'

fix(fatfs): re-enable fatfs and vfs psram/ccomp CI tests (v6.0)

See merge request espressif/esp-idf!50185

components/fatfs/test_apps/flash_wl/pytest_fatfs_flash_wl.py

@@ -20,3 +20,17 @@ from pytest_embedded_idf.utils import idf_parametrize
 @idf_parametrize('target', ['esp32', 'esp32c3'], indirect=['target'])
 def test_fatfs_flash_wl_generic(dut: Dut) -> None:
     dut.run_all_single_board_cases(timeout=240)
+
+
+@pytest.mark.generic
+@pytest.mark.flaky(reruns=2, reruns_delay=5)
+@pytest.mark.psram
+@pytest.mark.parametrize(
+    'config',
+    [
+        'psram',
+    ],
+)
+@idf_parametrize('target', ['esp32'], indirect=['target'])
+def test_fatfs_flash_wl_psram(dut: Dut) -> None:
+    dut.run_all_single_board_cases(timeout=180)

components/fatfs/test_apps/sdcard/pytest_fatfs_sdcard.py

@@ -30,3 +30,30 @@ def test_fatfs_sdcard_generic_sdmmc(dut: Dut) -> None:
 @idf_parametrize('target', ['esp32', 'esp32c3'], indirect=['target'])
 def test_fatfs_sdcard_generic_sdspi(dut: Dut) -> None:
     dut.run_all_single_board_cases(group='sdspi', timeout=180)
+
+
+@pytest.mark.sdcard_sdmode
+@pytest.mark.psram
+@pytest.mark.parametrize(
+    'config',
+    [
+        'psram',
+    ],
+)
+@idf_parametrize('target', ['esp32'], indirect=['target'])
+def test_fatfs_sdcard_psram_sdmmc(dut: Dut) -> None:
+    dut.run_all_single_board_cases(group='sdmmc', timeout=180)
+
+
+@pytest.mark.temp_skip_ci(targets=['esp32'], reason='IDFCI-2058, temporary lack runner')
+@pytest.mark.sdcard_spimode
+@pytest.mark.psram
+@pytest.mark.parametrize(
+    'config',
+    [
+        'psram',
+    ],
+)
+@idf_parametrize('target', ['esp32'], indirect=['target'])
+def test_fatfs_sdcard_psram_sdspi(dut: Dut) -> None:
+    dut.run_all_single_board_cases(group='sdspi', timeout=180)

components/spiffs/test_apps/.build-test-rules.yml

@@ -1,6 +1,6 @@
 components/spiffs/test_apps:
   disable_test:
-    - if: IDF_TARGET not in ["esp32", "esp32c3"]
+    - if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3"]
       reason: These chips should be sufficient for test coverage (Xtensa and RISC-V, single and dual core)
 
   depends_components:

components/spiffs/test_apps/pytest_spiffs.py

@@ -18,3 +18,16 @@ from pytest_embedded_idf.utils import idf_parametrize
 @idf_parametrize('target', ['esp32', 'esp32c3'], indirect=['target'])
 def test_spiffs_generic(dut: Dut) -> None:
     dut.run_all_single_board_cases(timeout=120)
+
+
+@pytest.mark.quad_psram
+@pytest.mark.parametrize(
+    'config',
+    [
+        'psram',
+    ],
+    indirect=True,
+)
+@idf_parametrize('target', ['esp32s3'], indirect=['target'])
+def test_spiffs_psram(dut: Dut) -> None:
+    dut.run_all_single_board_cases(timeout=120)

components/vfs/test_apps/.build-test-rules.yml

@@ -5,7 +5,7 @@ components/vfs/test_apps:
       reason: not support yet # TODO: [esp32h21] IDF-11593 [ESP32H4] IDF-12372
 
   disable_test:
-    - if: IDF_TARGET not in ["esp32c2", "esp32c3", "esp32c6", "esp32h2"]
+    - if: IDF_TARGET not in ["esp32", "esp32c2", "esp32c3", "esp32c6", "esp32h2", "esp32s3"]
       temporary: true
       reason: lack of runners
 

components/vfs/test_apps/pytest_vfs.py

@@ -18,3 +18,29 @@ from pytest_embedded_idf.utils import idf_parametrize
 @idf_parametrize('target', ['esp32c2', 'esp32c3', 'esp32c6', 'esp32h2'], indirect=['target'])
 def test_vfs_default(dut: Dut) -> None:
     dut.run_all_single_board_cases()
+
+
+@pytest.mark.generic
+@pytest.mark.parametrize(
+    'config',
+    [
+        'ccomp',
+    ],
+    indirect=True,
+)
+@idf_parametrize('target', ['esp32'], indirect=['target'])
+def test_vfs_ccomp(dut: Dut) -> None:
+    dut.run_all_single_board_cases()
+
+
+@pytest.mark.quad_psram
+@pytest.mark.parametrize(
+    'config',
+    [
+        'psram',
+    ],
+    indirect=True,
+)
+@idf_parametrize('target', ['esp32s3'], indirect=['target'])
+def test_vfs_psram(dut: Dut) -> None:
+    dut.run_all_single_board_cases()