feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'ci/fix_test_examples_efuse_with_virt_secure_boot_v2' into 'master'

Browse Source 
ci: Run test_examples_efuse_with_virt_secure_boot_v2 only on ESP32 ECO3

Closes IDFCI-1600

See merge request espressif/esp-idf!22233
This commit is contained in:
Mahavir Jain
2023-02-15 11:54:01 +08:00
parent 01734d15c8 c191e95300
commit db48197619
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab/ci/target-test.yml
View File

@@ -54,6 +54,14 @@ example_test_pytest_esp32_generic:
tags: [ esp32, generic ] tags: [ esp32, generic ]
parallel: 3 parallel: 3
example_test_pytest_esp32_esp32eco3:
extends:
- .pytest_examples_dir_template
- .rules:test:example_test-esp32
needs:
- build_pytest_examples_esp32
tags: [ esp32, esp32eco3 ]
example_test_pytest_esp32_ir_transceiver: example_test_pytest_esp32_ir_transceiver:
extends: extends:
- .pytest_examples_dir_template - .pytest_examples_dir_template

1
conftest.py
View File

@@ -119,6 +119,7 @@ ENV_MARKERS = {
'no32kXtal': 'Runner with no external 32k crystal connected', 'no32kXtal': 'Runner with no external 32k crystal connected',
'multi_dut_modbus_rs485': 'a pair of runners connected by RS485 bus', 'multi_dut_modbus_rs485': 'a pair of runners connected by RS485 bus',
'psramv0': 'Runner with PSRAM version 0', 'psramv0': 'Runner with PSRAM version 0',
'esp32eco3': 'Runner with esp32 eco3 connected',
# multi-dut markers # multi-dut markers
'ieee802154': 'ieee802154 related tests should run on ieee802154 runners.', 'ieee802154': 'ieee802154 related tests should run on ieee802154 runners.',
'openthread_br': 'tests should be used for openthread border router.', 'openthread_br': 'tests should be used for openthread border router.',

4
examples/system/efuse/pytest_system_efuse_example.py
View File

@@ -355,8 +355,8 @@ def test_examples_efuse_with_virt_secure_boot_v1_pre_loaded(dut: Dut) -> None:
dut.expect('example: Done') dut.expect('example: Done')
@pytest.mark.generic
@pytest.mark.esp32 @pytest.mark.esp32
@pytest.mark.esp32eco3
@pytest.mark.parametrize('config', [('virt_secure_boot_v2.esp32'),], indirect=True) @pytest.mark.parametrize('config', [('virt_secure_boot_v2.esp32'),], indirect=True)
@pytest.mark.parametrize('skip_autoflash', ['y'], indirect=True) @pytest.mark.parametrize('skip_autoflash', ['y'], indirect=True)
def test_examples_efuse_with_virt_secure_boot_v2(dut: Dut) -> None: def test_examples_efuse_with_virt_secure_boot_v2(dut: Dut) -> None:
@@ -471,8 +471,8 @@ def test_examples_efuse_with_virt_secure_boot_v2(dut: Dut) -> None:
dut.expect('example: Done') dut.expect('example: Done')
@pytest.mark.generic
@pytest.mark.esp32 @pytest.mark.esp32
@pytest.mark.esp32eco3
@pytest.mark.parametrize('config', [('virt_secure_boot_v2.esp32'),], indirect=True) @pytest.mark.parametrize('config', [('virt_secure_boot_v2.esp32'),], indirect=True)
@pytest.mark.parametrize('skip_autoflash', ['y'], indirect=True) @pytest.mark.parametrize('skip_autoflash', ['y'], indirect=True)
def test_examples_efuse_with_virt_secure_boot_v2_pre_loaded(dut: Dut) -> None: def test_examples_efuse_with_virt_secure_boot_v2_pre_loaded(dut: Dut) -> None: