alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'test/enable_esp32s2_ut_by_default' into 'master'

Browse Source 
CI: enable esp32s2 ut jobs by default

See merge request espressif/esp-idf!9237
This commit is contained in:
Angus Gratton 2020-12-02 08:33:18 +08:00
commit 0f8afff021
3 changed files with 75 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/ci/config/rules.yml
View File

@ -35,11 +35,14 @@
.if-label-unit_test: &if-label-unit_test
if: '$BOT_LABEL_UNIT_TEST'
.if-label-unit_test_s2: &if-label-unit_test_s2
.if-label-unit_test-32: &if-label-unit_test-32
if: '$BOT_LABEL_UNIT_TEST_32'
.if-label-unit_test-s2: &if-label-unit_test-s2
if: '$BOT_LABEL_UNIT_TEST_S2'
.if-label-unit_test-all_targets: &if-label-unit_test-all_targets
if: '$BOT_LABEL_UNIT_TEST || $BOT_LABEL_UNIT_TEST_S2'
.if-label-unit_test-all_labels: &if-label-unit_test-all_labels
if: '$BOT_LABEL_UNIT_TEST || $BOT_LABEL_UNIT_TEST_32 || $BOT_LABEL_UNIT_TEST_S2'
.if-label-weekend_test: &if-label-weekend_test
if: '$BOT_LABEL_WEEKEND_TEST'
@ -176,11 +179,19 @@
.rules:tests:unit_test:
rules:
- <<: *if-protected-no_label
- <<: *if-label-unit_test
- <<: *if-label-unit_test-all_labels
.rules:tests:unit_test_s2-only:
.rules:tests:unit_test_32:
rules:
- <<: *if-label-unit_test_s2
- <<: *if-protected-no_label
- <<: *if-label-unit_test
- <<: *if-label-unit_test-32
.rules:tests:unit_test_s2:
rules:
- <<: *if-protected-no_label
- <<: *if-label-unit_test
- <<: *if-label-unit_test-s2
.rules:tests:integration_test:
rules:
@ -193,7 +204,7 @@
- <<: *if-label-regular_test
- <<: *if-label-example_test
- <<: *if-label-custom_test
- <<: *if-label-unit_test-all_targets
- <<: *if-label-unit_test-all_labels
- <<: *if-label-integration_test
- <<: *if-label-weekend_test
@ -216,7 +227,7 @@
- <<: *if-protected-no_label
- <<: *if-label-build
- <<: *if-label-regular_test
- <<: *if-label-unit_test-all_targets
- <<: *if-label-unit_test-all_labels
.rules:build_tests:example_test-weekend_test:
rules:
@ -241,7 +252,7 @@
- <<: *if-label-regular_test
- <<: *if-label-example_test
- <<: *if-label-custom_test
- <<: *if-label-unit_test-all_targets
- <<: *if-label-unit_test-all_labels
.rules:build_tests:target_test-weekend_test:
rules:
@ -250,5 +261,5 @@
- <<: *if-label-regular_test
- <<: *if-label-example_test
- <<: *if-label-custom_test
- <<: *if-label-unit_test-all_targets
- <<: *if-label-unit_test-all_labels
- <<: *if-label-weekend_test

81
tools/ci/config/target-test.yml
View File

@ -71,6 +71,16 @@
# run test
- python Runner.py $COMPONENT_UT_DIRS -c $CONFIG_FILE -e $ENV_FILE
.component_ut_32_template:
extends:
- .component_ut_template
- .rules:tests:unit_test_32
.component_ut_s2_template: # unused yet
extends:
- .component_ut_template
- .rules:tests:unit_test_s2
.unit_test_template:
extends:
- .target_test_job_template
@ -79,6 +89,16 @@
TEST_CASE_PATH: "$CI_PROJECT_DIR/tools/unit-test-app"
CONFIG_FILE_PATH: "${CI_PROJECT_DIR}/components/idf_test/unit_test/CIConfigs"
.unit_test_32_template:
extends:
- .unit_test_template
- .rules:tests:unit_test_32
.unit_test_s2_template:
extends:
- .unit_test_template
- .rules:tests:unit_test_s2
.integration_test_template:
extends:
- .target_test_job_template
@ -325,13 +345,13 @@ test_app_test_004:
- Example_GENERIC
component_ut_test_001:
extends: .component_ut_template
extends: .component_ut_32_template
tags:
- ESP32
- COMPONENT_UT_GENERIC
UT_001:
extends: .unit_test_template
extends: .unit_test_32_template
parallel: 45
tags:
- ESP32_IDF
@ -340,7 +360,7 @@ UT_001:
# Max. allowed value of 'parallel' is 50.
UT_002:
extends: .unit_test_template
extends: .unit_test_32_template
parallel: 13
tags:
- ESP32_IDF
@ -348,74 +368,74 @@ UT_002:
- psram
UT_003:
extends: .unit_test_template
extends: .unit_test_32_template
parallel: 2
tags:
- ESP32_IDF
- UT_T1_SDMODE
UT_004:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_T1_SPIMODE
UT_005:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_T1_SDMODE
- psram
UT_006:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_T1_SPIMODE
- psram
UT_008:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_T1_GPIO
- psram
UT_012:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_T1_LEDC
- psram
UT_014:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_T2_RS485
- psram
UT_015:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_T1_RMT
UT_016:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_T1_RMT
- psram
UT_017:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- EMMC
UT_018:
extends: .unit_test_template
extends: .unit_test_32_template
parallel: 2
tags:
- ESP32_IDF
@ -423,65 +443,60 @@ UT_018:
- 8Mpsram
UT_020:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- Example_SPI_Multi_device
- psram
UT_022:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_T2_I2C
- psram
UT_023:
extends: .unit_test_template
extends: .unit_test_32_template
parallel: 2
tags:
- ESP32_IDF
- UT_T1_MCPWM
UT_024:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_T1_MCPWM
- psram
UT_028:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_T2_1
- psram
UT_031:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_T1_FlashEncryption
UT_033:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_T2_Ethernet
- psram
UT_034:
extends: .unit_test_template
extends: .unit_test_32_template
parallel: 2
tags:
- ESP32_IDF
- UT_T1_ESP_FLASH
.unit_test_s2_template:
extends:
- .unit_test_template
- .rules:tests:unit_test_s2-only # due to the lack of runners, s2 tests will only be triggered by label
UT_035:
extends: .unit_test_s2_template
parallel: 46
@ -490,7 +505,7 @@ UT_035:
- UT_T1_1
UT_036:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_T1_PSRAMV0
@ -511,34 +526,34 @@ UT_038:
- UT_T1_ESP_FLASH
UT_041:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_T1_no32kXTAL
- psram
UT_043:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_T1_32kXTAL
- psram
UT_044:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_SDIO
UT_045:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_SDIO
- psram
UT_046:
extends: .unit_test_template
extends: .unit_test_32_template
tags:
- ESP32_IDF
- UT_T1_GPIO

11
tools/ci/python_packages/ttfw_idf/CIScanTests.py
View File

@ -13,7 +13,9 @@ from idf_py_actions.constants import SUPPORTED_TARGETS, PREVIEW_TARGETS
TEST_LABELS = {
'example_test': 'BOT_LABEL_EXAMPLE_TEST',
'test_apps': 'BOT_LABEL_CUSTOM_TEST',
'component_ut': ['BOT_LABEL_UNIT_TEST', 'BOT_LABEL_UNIT_TEST_S2'],
'component_ut': ['BOT_LABEL_UNIT_TEST',
'BOT_LABEL_UNIT_TEST_32',
'BOT_LABEL_UNIT_TEST_S2'],
}
BUILD_ALL_LABELS = [
@ -45,11 +47,10 @@ def _judge_build_or_not(action, build_all): # type: (str, bool) -> (bool, bool)
for label in labels:
if os.getenv(label):
logging.info('Build test cases apps')
logging.info('Build only test cases apps')
return True, False
else:
logging.info('Skip all')
return False, False
logging.info('Skip all')
return False, False
def output_json(apps_dict_list, target, build_system, output_dir):