From 8efca139056adc600972e2bc45aacb2e7981f512 Mon Sep 17 00:00:00 2001 From: Song Ruo Jing Date: Wed, 9 Nov 2022 15:28:20 +0800 Subject: [PATCH] ci: Enable target tests for esp32c6 --- .gitlab/ci/assign-test.yml | 8 +++ .gitlab/ci/rules.yml | 56 +++++++++++++++++++ .gitlab/ci/target-test.yml | 52 +++++++++++++++++ .../python_packages/ttfw_idf/IDFAssignTest.py | 1 + tools/ci/python_packages/ttfw_idf/IDFDUT.py | 2 +- .../unit-test-app/tools/ConfigDependency.yml | 1 + 6 files changed, 119 insertions(+), 1 deletion(-) diff --git a/.gitlab/ci/assign-test.yml b/.gitlab/ci/assign-test.yml index fd616f929a..45dfe583c0 100644 --- a/.gitlab/ci/assign-test.yml +++ b/.gitlab/ci/assign-test.yml @@ -31,6 +31,9 @@ assign_example_test: - job: build_examples_cmake_esp32c3 artifacts: false optional: true + - job: build_examples_cmake_esp32c6 + artifacts: false + optional: true - job: build_examples_cmake_esp32s3 artifacts: false optional: true @@ -55,6 +58,9 @@ assign_custom_test: - job: build_test_apps_esp32c3 artifacts: false optional: true + - job: build_test_apps_esp32c6 + artifacts: false + optional: true - job: build_test_apps_esp32s3 artifacts: false optional: true @@ -75,6 +81,8 @@ assign_unit_test: optional: true - job: build_esp_idf_tests_cmake_esp32c3 optional: true + - job: build_esp_idf_tests_cmake_esp32c6 + optional: true - job: build_esp_idf_tests_cmake_esp32s3 optional: true variables: diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 9465472572..eb814addd8 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -1628,6 +1628,21 @@ - <<: *if-dev-push changes: *patterns-target_test-wifi +.rules:test:component_ut-esp32c6: + 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-label-unit_test + - <<: *if-label-unit_test_esp32c6 + - <<: *if-dev-push + changes: *patterns-component_ut + .rules:test:component_ut-esp32h4-i154: rules: - <<: *if-revert-branch @@ -1736,6 +1751,19 @@ - <<: *if-dev-push changes: *patterns-custom_test +.rules:test:custom_test-esp32c6: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-custom_test + - <<: *if-label-custom_test_esp32c6 + - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-custom_test + .rules:test:custom_test-esp32s2: rules: - <<: *if-revert-branch @@ -1866,6 +1894,21 @@ when: never - <<: *if-example_test-ota-include_nightly_run-rule +.rules:test:example_test-esp32c6: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-example_test + - <<: *if-label-example_test_esp32c6 + - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-build-example_test + - <<: *if-dev-push + changes: *patterns-example_test + .rules:test:example_test-esp32s2: rules: - <<: *if-revert-branch @@ -2007,6 +2050,19 @@ - <<: *if-dev-push changes: *patterns-unit_test +.rules:test:unit_test-esp32c6: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-target_test + - <<: *if-label-unit_test + - <<: *if-label-unit_test_esp32c6 + - <<: *if-dev-push + changes: *patterns-unit_test + .rules:test:unit_test-esp32s2: rules: - <<: *if-revert-branch diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index 9f72b08eb2..3256e6cc24 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -132,6 +132,14 @@ example_test_pytest_esp32c3_flash_suspend: - build_pytest_examples_esp32c3 tags: [ esp32c3, flash_suspend ] +example_test_pytest_esp32c6_generic: + extends: + - .pytest_examples_dir_template + - .rules:test:example_test-esp32c6 + needs: + - build_pytest_examples_esp32c6 + tags: [ esp32c6, generic ] + example_test_pytest_esp32_ethernet_ota: extends: - .pytest_examples_dir_template @@ -597,6 +605,14 @@ component_ut_pytest_esp32c3_sdspi: - build_pytest_components_esp32c3 tags: [ esp32c3, sdcard_spimode ] +component_ut_pytest_esp32c6_generic: + extends: + - .pytest_components_dir_template + - .rules:test:component_ut-esp32c6 + needs: + - build_pytest_components_esp32c6 + tags: [ esp32c6, generic ] + component_ut_pytest_esp32h4_i154: extends: - .pytest_components_dir_template @@ -683,6 +699,14 @@ test_app_test_pytest_esp32c3_generic: - build_pytest_test_apps_esp32c3 tags: [ esp32c3, generic ] +test_app_test_pytest_esp32c6_generic: + extends: + - .pytest_test_apps_dir_template + - .rules:test:custom_test-esp32c6 + needs: + - build_pytest_test_apps_esp32c6 + tags: [ esp32c6, generic ] + test_app_test_pytest_esp32s3_mspi_f8r8: extends: - .pytest_test_apps_dir_template @@ -786,6 +810,11 @@ test_weekend_mqtt: - .example_test_template - .rules:test:example_test-esp32c3 +.example_test_esp32c6_template: + extends: + - .example_test_template + - .rules:test:example_test-esp32c6 + .example_test_esp32s3_template: extends: - .example_test_template @@ -894,6 +923,12 @@ example_test_C2_GENERIC: - ESP32C2 - Example_GENERIC +example_test_C6_GENERIC: + extends: .example_test_esp32c6_template + tags: + - ESP32C6 + - Example_GENERIC + .test_app_template: extends: .target_test_job_template needs: @@ -923,6 +958,11 @@ example_test_C2_GENERIC: - .test_app_template - .rules:test:custom_test-esp32c3 +.test_app_esp32c6_template: + extends: + - .test_app_template + - .rules:test:custom_test-esp32c6 + .test_app_esp32s3_template: extends: - .test_app_template @@ -976,6 +1016,11 @@ test_app_test_eth: - .unit_test_template - .rules:test:unit_test-esp32c3 +.unit_test_esp32c6_template: + extends: + - .unit_test_template + - .rules:test:unit_test-esp32c6 + UT_001: extends: .unit_test_esp32_template parallel: 32 @@ -1133,6 +1178,13 @@ UT_C3_SDSPI: - ESP32C3_IDF - UT_T1_SPIMODE +UT_C6: + extends: .unit_test_esp32c6_template + parallel: 12 + tags: + - ESP32C6_IDF + - UT_T1_1 + UT_S3: extends: .unit_test_esp32s3_template parallel: 19 diff --git a/tools/ci/python_packages/ttfw_idf/IDFAssignTest.py b/tools/ci/python_packages/ttfw_idf/IDFAssignTest.py index 3b68618c86..954d268fbd 100644 --- a/tools/ci/python_packages/ttfw_idf/IDFAssignTest.py +++ b/tools/ci/python_packages/ttfw_idf/IDFAssignTest.py @@ -119,6 +119,7 @@ class UnitTestGroup(IDFCaseGroup): 'esp32s3': 'ESP32S3DUT', 'esp32c2': 'ESP32C2DUT', 'esp32c3': 'ESP32C3DUT', + 'esp32c6': 'ESP32C6DUT', 'esp8266': 'ESP8266DUT', } diff --git a/tools/ci/python_packages/ttfw_idf/IDFDUT.py b/tools/ci/python_packages/ttfw_idf/IDFDUT.py index 7beec74848..660bda02e4 100644 --- a/tools/ci/python_packages/ttfw_idf/IDFDUT.py +++ b/tools/ci/python_packages/ttfw_idf/IDFDUT.py @@ -628,7 +628,7 @@ class ESP32C6DUT(IDFDUT): @classmethod def get_rom(cls): - return targets.ESP32C6BETAROM + return targets.ESP32C6ROM class ESP32H4DUT(IDFDUT): diff --git a/tools/unit-test-app/tools/ConfigDependency.yml b/tools/unit-test-app/tools/ConfigDependency.yml index 24f89e6ffe..cf9cc0ae46 100644 --- a/tools/unit-test-app/tools/ConfigDependency.yml +++ b/tools/unit-test-app/tools/ConfigDependency.yml @@ -5,6 +5,7 @@ "ESP32S3_IDF": "CONFIG_IDF_TARGET_ESP32S3=y" "ESP32C2_IDF": "CONFIG_IDF_TARGET_ESP32C2=y" "ESP32C3_IDF": "CONFIG_IDF_TARGET_ESP32C3=y" +"ESP32C6_IDF": "CONFIG_IDF_TARGET_ESP32C6=y" "quad_psram": '{CONFIG_SPIRAM_MODE_QUAD=y} and {CONFIG_IDF_TARGET_ESP32S3=y}' "octal_psram": '{CONFIG_SPIRAM_MODE_OCT=y} and {CONFIG_IDF_TARGET_ESP32S3=y}' "xtal_26mhz": '{CONFIG_XTAL_FREQ_26=y} and {CONFIG_IDF_TARGET_ESP32C2=y}'