diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml index 7526c02a06..19f77d95cc 100644 --- a/.gitlab/ci/build.yml +++ b/.gitlab/ci/build.yml @@ -231,14 +231,6 @@ build_pytest_examples_jtag: # for all targets IDF_TARGET: all TEST_DIR: examples -build_pytest_components_esp32h4: - extends: - - .build_pytest_template - - .rules:build:component_ut-esp32h4 - variables: - IDF_TARGET: esp32h4 - TEST_DIR: components - build_pytest_examples_esp32c6: extends: - .build_pytest_template diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 6c115428af..10d2b74c6d 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -801,38 +801,6 @@ - <<: *if-dev-push changes: *patterns-target_test-wifi -.rules:build:component_ut-esp32h4: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build - - <<: *if-label-component_ut - - <<: *if-label-component_ut_esp32h4 - - <<: *if-label-target_test - - <<: *if-label-unit_test - - <<: *if-label-unit_test_esp32h4 - - <<: *if-dev-push - changes: *patterns-build_components - - <<: *if-dev-push - changes: *patterns-build_system - - <<: *if-dev-push - changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-flash_multi - - <<: *if-dev-push - changes: *patterns-component_ut-sdio - - <<: *if-dev-push - changes: *patterns-component_ut-usb - - <<: *if-dev-push - changes: *patterns-downloadable-tools - - <<: *if-dev-push - changes: *patterns-target_test-adc - - <<: *if-dev-push - changes: *patterns-target_test-i154 - - <<: *if-dev-push - changes: *patterns-target_test-wifi - .rules:build:component_ut-esp32s2: rules: - <<: *if-revert-branch @@ -2093,6 +2061,19 @@ - <<: *if-dev-push changes: *patterns-target_test-adc +.rules:test:component_ut-esp32c6-i154: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-component_ut + - <<: *if-label-component_ut_esp32c6 + - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-i154 + .rules:test:component_ut-esp32h2: rules: - <<: *if-revert-branch @@ -2121,19 +2102,6 @@ - <<: *if-dev-push changes: *patterns-target_test-adc -.rules:test:component_ut-esp32h4-i154: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-component_ut - - <<: *if-label-component_ut_esp32h4 - - <<: *if-label-target_test - - <<: *if-dev-push - changes: *patterns-target_test-i154 - .rules:test:component_ut-esp32s2: rules: - <<: *if-revert-branch diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index c6a82f61be..1aae766bcd 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -868,13 +868,13 @@ component_ut_pytest_esp32c6_adc: - build_pytest_components_esp32c6 tags: [ esp32c6, adc ] -component_ut_pytest_esp32h4_i154: +component_ut_pytest_esp32c6_i154: extends: - .pytest_components_dir_template - - .rules:test:component_ut-esp32h4-i154 + - .rules:test:component_ut-esp32c6-i154 needs: - - build_pytest_components_esp32h4 - tags: [ esp32h4, ieee802154 ] + - build_pytest_components_esp32c6 + tags: [ esp32c6, ieee802154 ] example_test_pytest_openthread_br: extends: diff --git a/components/ieee802154/.build-test-rules.yml b/components/ieee802154/.build-test-rules.yml index bc665b4a50..2200b10c86 100644 --- a/components/ieee802154/.build-test-rules.yml +++ b/components/ieee802154/.build-test-rules.yml @@ -2,5 +2,4 @@ components/ieee802154/test_apps/test_ieee802154: enable: - - if: IDF_TARGET == "esp32h4" - reason: only test on esp32h4 + - if: IDF_TARGET == "esp32c6" diff --git a/components/ieee802154/test_apps/test_ieee802154/README.md b/components/ieee802154/test_apps/test_ieee802154/README.md index de34fd44fd..65eeecb079 100644 --- a/components/ieee802154/test_apps/test_ieee802154/README.md +++ b/components/ieee802154/test_apps/test_ieee802154/README.md @@ -1,3 +1,3 @@ -| Supported Targets | ESP32-H4 | +| Supported Targets | ESP32-C6 | | ----------------- | -------- | diff --git a/components/ieee802154/test_apps/test_ieee802154/pytest_test_ieee802154.py b/components/ieee802154/test_apps/test_ieee802154/pytest_test_ieee802154.py index b2863b4b34..bb7a789c49 100644 --- a/components/ieee802154/test_apps/test_ieee802154/pytest_test_ieee802154.py +++ b/components/ieee802154/test_apps/test_ieee802154/pytest_test_ieee802154.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 import random @@ -110,11 +110,11 @@ def dlt_short_extern_addr_in_pendingtable(ser:IdfDut, table:List, short:int=5, e cnt = cnt + 1 -@pytest.mark.esp32h4 +@pytest.mark.esp32c6 @pytest.mark.ieee802154 @pytest.mark.parametrize( - 'count, config, beta_target', [ - (2, 'release', 'esp32h2beta2'), # No need to rename beta_target as it is still called h2 in esptool + 'count, config', [ + (2, 'release'), ], indirect=True ) def test_based_txrx(dut: Tuple[IdfDut, IdfDut]) -> None: @@ -147,12 +147,11 @@ def test_based_txrx(dut: Tuple[IdfDut, IdfDut]) -> None: assert 'Rx Done' not in str(tmp) -@pytest.mark.esp32h4 -@pytest.mark.ieee802154 +@pytest.mark.esp32c6 +@pytest.mark.generic @pytest.mark.parametrize( - 'count, config, beta_target', [ - (1, 'release', 'esp32h2beta2'), - ], indirect=True + 'config', ['release',], + indirect=True ) def test_based_energy(dut: IdfDut) -> None: transmit = dut @@ -162,12 +161,11 @@ def test_based_energy(dut: IdfDut) -> None: transmit.expect('ed_scan_rss_value:', timeout=1) -@pytest.mark.esp32h4 -@pytest.mark.ieee802154 +@pytest.mark.esp32c6 +@pytest.mark.generic @pytest.mark.parametrize( - 'count, config, beta_target', [ - (1, 'release', 'esp32h2beta2'), - ], indirect=True + 'config', ['release',], + indirect=True ) def test_based_channel(dut: IdfDut) -> None: transmit = dut @@ -178,12 +176,11 @@ def test_based_channel(dut: IdfDut) -> None: transmit.expect('current channel: 23', timeout=1) -@pytest.mark.esp32h4 -@pytest.mark.ieee802154 +@pytest.mark.esp32c6 +@pytest.mark.generic @pytest.mark.parametrize( - 'count, config, beta_target', [ - (1, 'release', 'esp32h2beta2'), - ], indirect=True + 'config', ['release',], + indirect=True ) def test_based_txpower(dut: IdfDut) -> None: transmit = dut @@ -194,12 +191,11 @@ def test_based_txpower(dut: IdfDut) -> None: transmit.expect('current txpower: 13', timeout=1) -@pytest.mark.esp32h4 -@pytest.mark.ieee802154 +@pytest.mark.esp32c6 +@pytest.mark.generic @pytest.mark.parametrize( - 'count, config, beta_target', [ - (1, 'release', 'esp32h2beta2'), - ], indirect=True + 'config', ['release',], + indirect=True ) def test_based_promiscuous(dut: IdfDut) -> None: transmit = dut @@ -214,12 +210,11 @@ def test_based_promiscuous(dut: IdfDut) -> None: transmit.expect('hardware promiscuous mode was disabled', timeout=1) -@pytest.mark.esp32h4 -@pytest.mark.ieee802154 +@pytest.mark.esp32c6 +@pytest.mark.generic @pytest.mark.parametrize( - 'count, config, beta_target', [ - (1, 'release', 'esp32h2beta2'), - ], indirect=True + 'config', ['release',], + indirect=True ) def test_based_panid(dut: IdfDut) -> None: transmit = dut @@ -230,12 +225,11 @@ def test_based_panid(dut: IdfDut) -> None: transmit.expect('current panid: 0x60', timeout=1) -@pytest.mark.esp32h4 -@pytest.mark.ieee802154 +@pytest.mark.esp32c6 +@pytest.mark.generic @pytest.mark.parametrize( - 'count, config, beta_target', [ - (1, 'release', 'esp32h2beta2'), - ], indirect=True + 'config', ['release',], + indirect=True ) def test_based_shortaddr(dut: IdfDut) -> None: transmit = dut @@ -246,12 +240,11 @@ def test_based_shortaddr(dut: IdfDut) -> None: transmit.expect('current shortaddr: 0x1234', timeout=1) -@pytest.mark.esp32h4 -@pytest.mark.ieee802154 +@pytest.mark.esp32c6 +@pytest.mark.generic @pytest.mark.parametrize( - 'count, config, beta_target', [ - (1, 'release', 'esp32h2beta2'), - ], indirect=True + 'config', ['release',], + indirect=True ) def test_based_extaddr(dut: IdfDut) -> None: transmit = dut @@ -262,12 +255,11 @@ def test_based_extaddr(dut: IdfDut) -> None: transmit.expect('get extaddr: 0807060504030201', timeout=1) -@pytest.mark.esp32h4 -@pytest.mark.ieee802154 +@pytest.mark.esp32c6 +@pytest.mark.generic @pytest.mark.parametrize( - 'count, config, beta_target', [ - (1, 'release', 'esp32h2beta2'), - ], indirect=True + 'config', ['release',], + indirect=True ) def test_based_coordinator(dut: IdfDut) -> None: transmit = dut @@ -282,12 +274,11 @@ def test_based_coordinator(dut: IdfDut) -> None: transmit.expect('hardware coordinator was disabled', timeout=1) -@pytest.mark.esp32h4 -@pytest.mark.ieee802154 +@pytest.mark.esp32c6 +@pytest.mark.generic @pytest.mark.parametrize( - 'count, config, beta_target', [ - (1, 'release', 'esp32h2beta2'), - ], indirect=True + 'config', ['release',], + indirect=True ) def test_based_pending(dut: IdfDut) -> None: transmit = dut @@ -304,12 +295,11 @@ def test_based_pending(dut: IdfDut) -> None: transmit.expect('clear the pending address table', timeout=1) -@pytest.mark.esp32h4 -@pytest.mark.ieee802154 +@pytest.mark.esp32c6 +@pytest.mark.generic @pytest.mark.parametrize( - 'count, config, beta_target', [ - (1, 'release', 'esp32h2beta2'), - ], indirect=True + 'config', ['release',], + indirect=True ) def test_based_cca(dut: IdfDut) -> None: transmit = dut @@ -322,11 +312,11 @@ def test_based_cca(dut: IdfDut) -> None: transmit.expect('threshold:-60 dB, mode: 0', timeout=1) -@pytest.mark.esp32h4 +@pytest.mark.esp32c6 @pytest.mark.ieee802154 @pytest.mark.parametrize( - 'count, config, beta_target', [ - (2, 'release', 'esp32h2beta2'), + 'count, config', [ + (2, 'release'), ], indirect=True ) def test_based_autoack(dut: Tuple[IdfDut, IdfDut]) -> None: @@ -369,11 +359,11 @@ def test_based_autoack(dut: Tuple[IdfDut, IdfDut]) -> None: transmit.expect('02 00 00', timeout=1) -@pytest.mark.esp32h4 +@pytest.mark.esp32c6 @pytest.mark.ieee802154 @pytest.mark.parametrize( - 'count, config, beta_target', [ - (2, 'release', 'esp32h2beta2'), + 'count, config', [ + (2, 'release'), ], indirect=True ) def test_based_autopending(dut: Tuple[IdfDut, IdfDut]) -> None: @@ -567,12 +557,11 @@ def test_based_autopending(dut: Tuple[IdfDut, IdfDut]) -> None: transmit.expect('02 00 10', timeout=1) -@pytest.mark.esp32h4 +@pytest.mark.esp32c6 @pytest.mark.ieee802154 @pytest.mark.parametrize( - 'count, config, beta_target', [ - (1, 'release', 'esp32h2beta2'), - ], indirect=True + 'config', ['release',], + indirect=True ) def test_based_transmit_failed(dut: IdfDut) -> None: transmit = dut @@ -590,12 +579,11 @@ def test_based_transmit_failed(dut: IdfDut) -> None: transmit.expect('08 09 00 00 00 00 00 00', timeout=1) -@pytest.mark.esp32h4 -@pytest.mark.ieee802154 +@pytest.mark.esp32c6 +@pytest.mark.generic @pytest.mark.parametrize( - 'count, config, beta_target', [ - (1, 'release', 'esp32h2beta2'), - ], indirect=True + 'config', ['release',], + indirect=True ) def test_based_initialize(dut: IdfDut) -> None: transmit = dut diff --git a/components/ieee802154/test_apps/test_ieee802154/sdkconfig.defaults b/components/ieee802154/test_apps/test_ieee802154/sdkconfig.defaults index eec7cfd0a2..e625399017 100644 --- a/components/ieee802154/test_apps/test_ieee802154/sdkconfig.defaults +++ b/components/ieee802154/test_apps/test_ieee802154/sdkconfig.defaults @@ -1,4 +1,4 @@ # This file was generated using idf.py save-defconfig. It can be edited manually. # Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration # -CONFIG_IDF_TARGET_ESP32H4_BETA_VERSION_2=y +CONFIG_IDF_TARGET_ESP32C6=y