espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ci/add_generic_to_xtal_26mhz_runners_5.0' into 'release/v5.0'

Browse Source 
Ci: add generic to xtal 26mhz runners 5.0

See merge request espressif/esp-idf!21756
This commit is contained in:
Jiang Jiang Jian
2023-03-02 17:17:47 +08:00
parent 0a5ed6ff9c 3c58ca9285
commit 7d7196d2d2
9 changed files with 168 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
.gitlab/ci/rules.yml
View File

@@ -239,13 +239,14 @@
- "components/hal/esp32s*/include/hal/usb*.h"
- "components/usb/**/*"
# for jobs: component_ut_pytest_esp32x_adc:
.patterns-component_ut-adc: &patterns-component_ut-adc
# for jobs: *_pytest_esp32x_adc:
.patterns-target_test-adc: &patterns-target_test-adc
- "components/esp_adc/**/*"
- "components/driver/**/*"
- "components/hal/**/*"
- "components/esp_hw_support/**/*"
- "components/efuse/**/*"
- "examples/peripherals/adc/**/*"
##############
@@ -531,10 +532,10 @@
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-component_ut
- <<: *if-dev-push
changes: *patterns-component_ut-adc
- <<: *if-dev-push
changes: *patterns-component_ut-usb
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -556,10 +557,10 @@
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-component_ut
- <<: *if-dev-push
changes: *patterns-component_ut-adc
- <<: *if-dev-push
changes: *patterns-component_ut-usb
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -580,10 +581,10 @@
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-component_ut
- <<: *if-dev-push
changes: *patterns-component_ut-adc
- <<: *if-dev-push
changes: *patterns-component_ut-usb
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -604,10 +605,10 @@
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-component_ut
- <<: *if-dev-push
changes: *patterns-component_ut-adc
- <<: *if-dev-push
changes: *patterns-component_ut-usb
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -628,10 +629,10 @@
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-component_ut
- <<: *if-dev-push
changes: *patterns-component_ut-adc
- <<: *if-dev-push
changes: *patterns-component_ut-usb
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -652,10 +653,10 @@
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-component_ut
- <<: *if-dev-push
changes: *patterns-component_ut-adc
- <<: *if-dev-push
changes: *patterns-component_ut-usb
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -676,10 +677,10 @@
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-component_ut
- <<: *if-dev-push
changes: *patterns-component_ut-adc
- <<: *if-dev-push
changes: *patterns-component_ut-usb
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -704,6 +705,8 @@
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-custom_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -723,6 +726,8 @@
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-custom_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -741,6 +746,8 @@
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-custom_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -759,6 +766,8 @@
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-custom_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -777,6 +786,8 @@
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-custom_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -795,6 +806,8 @@
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-custom_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -813,6 +826,8 @@
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-custom_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -858,6 +873,8 @@
changes: *patterns-example_test-usb
- <<: *if-dev-push
changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -888,6 +905,8 @@
changes: *patterns-example_test-usb
- <<: *if-dev-push
changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -916,6 +935,8 @@
changes: *patterns-example_test-usb
- <<: *if-dev-push
changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -945,6 +966,8 @@
changes: *patterns-example_test-usb
- <<: *if-dev-push
changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -973,6 +996,8 @@
changes: *patterns-example_test-usb
- <<: *if-dev-push
changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -1001,6 +1026,8 @@
changes: *patterns-example_test-usb
- <<: *if-dev-push
changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -1029,6 +1056,8 @@
changes: *patterns-example_test-usb
- <<: *if-dev-push
changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
@@ -1114,8 +1143,6 @@
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-component_ut
- <<: *if-dev-push
changes: *patterns-component_ut-adc
- <<: *if-dev-push
changes: *patterns-component_ut-usb
- <<: *if-dev-push
@@ -1134,6 +1161,8 @@
changes: *patterns-integration_test-ble
- <<: *if-dev-push
changes: *patterns-integration_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
- <<: *if-dev-push
@@ -1160,6 +1189,8 @@
changes: *patterns-build_components
- <<: *if-dev-push
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
- <<: *if-dev-push
@@ -1181,6 +1212,8 @@
changes: *patterns-build_components
- <<: *if-dev-push
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
- <<: *if-dev-push
@@ -1201,6 +1234,8 @@
changes: *patterns-build_components
- <<: *if-dev-push
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
- <<: *if-dev-push
@@ -1221,6 +1256,8 @@
changes: *patterns-build_components
- <<: *if-dev-push
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
- <<: *if-dev-push
@@ -1241,6 +1278,8 @@
changes: *patterns-build_components
- <<: *if-dev-push
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
- <<: *if-dev-push
@@ -1261,6 +1300,8 @@
changes: *patterns-build_components
- <<: *if-dev-push
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
- <<: *if-dev-push
@@ -1281,6 +1322,8 @@
changes: *patterns-build_components
- <<: *if-dev-push
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-target_test-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
- <<: *if-dev-push
@@ -1358,7 +1401,7 @@
- <<: *if-label-component_ut_esp32
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-component_ut-adc
changes: *patterns-target_test-adc
.rules:test:component_ut-esp32-bt:
rules:
@@ -1445,7 +1488,7 @@
- <<: *if-label-component_ut_esp32c2
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-component_ut-adc
changes: *patterns-target_test-adc
.rules:test:component_ut-esp32c2-bt:
rules:
@@ -1532,7 +1575,7 @@
- <<: *if-label-component_ut_esp32c3
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-component_ut-adc
changes: *patterns-target_test-adc
.rules:test:component_ut-esp32c3-bt:
rules:
@@ -1619,7 +1662,7 @@
- <<: *if-label-component_ut_esp32h2
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-component_ut-adc
changes: *patterns-target_test-adc
.rules:test:component_ut-esp32h2-bt:
rules:
@@ -1706,7 +1749,7 @@
- <<: *if-label-component_ut_esp32s2
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-component_ut-adc
changes: *patterns-target_test-adc
.rules:test:component_ut-esp32s2-bt:
rules:
@@ -1793,7 +1836,7 @@
- <<: *if-label-component_ut_esp32s3
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-component_ut-adc
changes: *patterns-target_test-adc
.rules:test:component_ut-esp32s3-bt:
rules:
@@ -1877,6 +1920,8 @@
- <<: *if-label-custom_test
- <<: *if-label-custom_test_esp32
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:custom_test-esp32-bt:
rules:
@@ -1958,6 +2003,8 @@
- <<: *if-label-custom_test
- <<: *if-label-custom_test_esp32c2
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:custom_test-esp32c2-bt:
rules:
@@ -2039,6 +2086,8 @@
- <<: *if-label-custom_test
- <<: *if-label-custom_test_esp32c3
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:custom_test-esp32c3-bt:
rules:
@@ -2120,6 +2169,8 @@
- <<: *if-label-custom_test
- <<: *if-label-custom_test_esp32h2
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:custom_test-esp32h2-bt:
rules:
@@ -2201,6 +2252,8 @@
- <<: *if-label-custom_test
- <<: *if-label-custom_test_esp32s2
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:custom_test-esp32s2-bt:
rules:
@@ -2282,6 +2335,8 @@
- <<: *if-label-custom_test
- <<: *if-label-custom_test_esp32s3
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:custom_test-esp32s3-bt:
rules:
@@ -2365,6 +2420,8 @@
- <<: *if-label-example_test
- <<: *if-label-example_test_esp32
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:example_test-esp32-bt:
rules:
@@ -2465,6 +2522,8 @@
- <<: *if-label-example_test
- <<: *if-label-example_test_esp32c2
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:example_test-esp32c2-bt:
rules:
@@ -2556,6 +2615,8 @@
- <<: *if-label-example_test
- <<: *if-label-example_test_esp32c3
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:example_test-esp32c3-bt:
rules:
@@ -2656,6 +2717,8 @@
- <<: *if-label-example_test
- <<: *if-label-example_test_esp32h2
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:example_test-esp32h2-bt:
rules:
@@ -2747,6 +2810,8 @@
- <<: *if-label-example_test
- <<: *if-label-example_test_esp32s2
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:example_test-esp32s2-bt:
rules:
@@ -2838,6 +2903,8 @@
- <<: *if-label-example_test
- <<: *if-label-example_test_esp32s3
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:example_test-esp32s3-bt:
rules:
@@ -2995,6 +3062,8 @@
- <<: *if-label-target_test
- <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:unit_test-esp32-bt:
rules:
@@ -3078,6 +3147,8 @@
- <<: *if-label-target_test
- <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32c2
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:unit_test-esp32c2-bt:
rules:
@@ -3161,6 +3232,8 @@
- <<: *if-label-target_test
- <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32c3
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:unit_test-esp32c3-bt:
rules:
@@ -3244,6 +3317,8 @@
- <<: *if-label-target_test
- <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32h2
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:unit_test-esp32h2-bt:
rules:
@@ -3327,6 +3402,8 @@
- <<: *if-label-target_test
- <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32s2
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:unit_test-esp32s2-bt:
rules:
@@ -3410,6 +3487,8 @@
- <<: *if-label-target_test
- <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32s3
- <<: *if-dev-push
changes: *patterns-target_test-adc
.rules:test:unit_test-esp32s3-bt:
rules:

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

@@ -79,14 +79,6 @@ example_test_pytest_esp32c2_generic:
- build_pytest_examples_esp32c2
tags: [ esp32c2, generic, xtal_40mhz ]
example_test_pytest_esp32c2_26mhz:
extends:
- .pytest_examples_dir_template
- .rules:test:example_test-esp32c2
needs:
- build_pytest_examples_esp32c2
tags: [ esp32c2, xtal_26mhz ]
example_test_pytest_esp32c3_generic:
extends:
- .pytest_examples_dir_template
@@ -247,6 +239,46 @@ example_test_pytest_esp32_extflash:
- build_pytest_examples_esp32
tags: [ esp32, external_flash ]
example_test_pytest_esp32_adc:
extends:
- .pytest_examples_dir_template
- .rules:test:example_test-esp32-adc
needs:
- build_pytest_examples_esp32
tags: [ esp32, adc ]
example_test_pytest_esp32s2_adc:
extends:
- .pytest_examples_dir_template
- .rules:test:example_test-esp32s2-adc
needs:
- build_pytest_examples_esp32s2
tags: [ esp32s2, adc ]
example_test_pytest_esp32s3_adc:
extends:
- .pytest_examples_dir_template
- .rules:test:example_test-esp32s3-adc
needs:
- build_pytest_examples_esp32s3
tags: [ esp32s3, adc ]
example_test_pytest_esp32c3_adc:
extends:
- .pytest_examples_dir_template
- .rules:test:example_test-esp32c3-adc
needs:
- build_pytest_examples_esp32c3
tags: [ esp32c3, adc ]
example_test_pytest_esp32c2_adc:
extends:
- .pytest_examples_dir_template
- .rules:test:example_test-esp32c2-adc
needs:
- build_pytest_examples_esp32c2
tags: [ esp32c2, adc, xtal_26mhz]
.pytest_components_dir_template:
extends: .pytest_template
variables:
@@ -362,7 +394,7 @@ component_ut_pytest_esp32c2_adc:
- .rules:test:component_ut-esp32c2-adc
needs:
- build_pytest_components_esp32c2
tags: [ esp32c2, adc ]
tags: [ esp32c2, adc, xtal_26mhz ]
component_ut_pytest_esp32c2_xtal_26mhz:
extends:
@@ -370,7 +402,7 @@ component_ut_pytest_esp32c2_xtal_26mhz:
- .rules:test:component_ut-esp32c2
needs:
- build_pytest_components_esp32c2
tags: [ esp32c2, xtal_26mhz ]
tags: [ esp32c2, generic, xtal_26mhz ]
component_ut_pytest_esp32c3_generic:
extends:
@@ -445,14 +477,6 @@ test_app_test_pytest_esp32c2_generic:
- build_pytest_test_apps_esp32c2
tags: [ esp32c2, generic, xtal_40mhz ]
test_app_test_pytest_esp32c2_26mhz:
extends:
- .pytest_test_apps_dir_template
- .rules:test:custom_test-esp32c2
needs:
- build_pytest_test_apps_esp32c2
tags: [ esp32c2, xtal_26mhz ]
test_app_test_pytest_esp32c3_generic:
extends:
- .pytest_test_apps_dir_template

1
components/driver/test_apps/gptimer/pytest_gptimer.py
View File

@@ -22,6 +22,7 @@ def test_gptimer(dut: Dut) -> None:
@pytest.mark.esp32c2
@pytest.mark.generic
@pytest.mark.xtal_26mhz
@pytest.mark.parametrize(
'config, baud',

2
components/driver/test_apps/legacy_adc_driver/pytest_legacy_adc.py
View File

@@ -23,9 +23,9 @@ def test_legacy_adc(dut: Dut) -> None:
dut.expect_unity_test_output(timeout=240)
# All ESP32C2 ADC runners are 26m xtal
@pytest.mark.esp32c2
@pytest.mark.adc
@pytest.mark.xtal_26mhz
@pytest.mark.parametrize(
'config, baud',
[

1
components/esp_adc/test_apps/adc/pytest_adc.py
View File

@@ -25,6 +25,7 @@ def test_adc(dut: Dut) -> None:
# No PM test, as C2 doesn't support ADC continuous mode
@pytest.mark.esp32c2
@pytest.mark.adc
@pytest.mark.xtal_26mhz
@pytest.mark.parametrize(
'config, baud',
[

1
examples/peripherals/adc/continuous_read/pytest_adc_continuous.py
View File

@@ -9,6 +9,7 @@ from pytest_embedded.dut import Dut
@pytest.mark.esp32s2
@pytest.mark.esp32s3
@pytest.mark.esp32c3
@pytest.mark.adc
def test_adc_continuous(dut: Dut) -> None:
res = dut.expect(r'TASK: ret is 0, ret_num is (\d+)')
num = res.group(1).decode('utf8')

18
examples/peripherals/adc/oneshot_read/pytest_adc_oneshot.py
View File

@@ -9,6 +9,20 @@ from pytest_embedded.dut import Dut
@pytest.mark.esp32s2
@pytest.mark.esp32s3
@pytest.mark.esp32c3
@pytest.mark.esp32c2
@pytest.mark.adc
def test_adc_oneshot(dut: Dut) -> None:
dut.expect(r'ADC_ONESHOT: ADC1 Channel\[(\d+)]\ Raw Data: (\d+)', timeout=5)
dut.expect(r'EXAMPLE: ADC1 Channel\[(\d+)\] Raw Data: (\d+)', timeout=5)
@pytest.mark.esp32c2
@pytest.mark.adc
@pytest.mark.xtal_26mhz
@pytest.mark.parametrize(
'config, baud',
[
('esp32c2_xtal26m', '74880'),
],
indirect=True,
)
def test_adc_oneshot_esp32c2_xtal_26mhz(dut: Dut) -> None:
dut.expect(r'EXAMPLE: ADC1 Channel\[(\d+)\] Raw Data: (\d+)', timeout=5)

2
examples/peripherals/adc/oneshot_read/sdkconfig.ci.esp32c2_xtal26m Normal file
View File

@@ -0,0 +1,2 @@
CONFIG_IDF_TARGET="esp32c2"
CONFIG_XTAL_FREQ_26=y

1
examples/protocols/sockets/tcp_server/example_test.py
View File

@@ -74,6 +74,7 @@ def test_examples_protocol_socket_tcpserver(env, extra_data):
ipv6_r = r':'.join((r'[0-9a-fA-F]{4}',) * 8) # expect all 8 octets from IPv6 (assumes it's printed in the long form)
ipv6 = dut1.expect(re.compile(r' IPv6 address: ({})'.format(ipv6_r)), timeout=30)[0]
print('Connected with IPv4={} and IPv6={}'.format(ipv4, ipv6))
dut1.expect('Socket listening')
interface = get_my_interface_by_dest_ip(ipv4)
# test IPv4