From 4a59bf95944dd563a5159f624fa39fdf878cbcec Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Fri, 25 Mar 2022 12:17:03 +0800 Subject: [PATCH 1/4] Revert "ci: temporarily disable s3 assign test" This reverts commit 8a31c528258f11b05606d838c80279d5395ce1ab. --- .../tiny_test_fw/Utility/CIAssignTest.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/tools/ci/python_packages/tiny_test_fw/Utility/CIAssignTest.py b/tools/ci/python_packages/tiny_test_fw/Utility/CIAssignTest.py index 7d517c343c..0cad445f50 100644 --- a/tools/ci/python_packages/tiny_test_fw/Utility/CIAssignTest.py +++ b/tools/ci/python_packages/tiny_test_fw/Utility/CIAssignTest.py @@ -312,21 +312,11 @@ class AssignTest(object): console_log('\t{}'.format(job['name']), 'O') # failures - real_failure_group = [] if failed_to_assign: - for group in failed_to_assign: - if ('ESP32S3_IDF' in group.filters.values() # for example_test and custom_test - or ['ESP32S3_IDF'] in group.filters.values()): # for unit_test - console_log('Bypassing Tag "ESP32S3_IDF" missing jobs for now!!!', 'O') # FIXME - continue - - real_failure_group.append(group) - - if real_failure_group: console_log('Too many test cases vs jobs to run. ' 'Please increase parallel count in .gitlab/ci/target-test.yml ' 'for jobs with specific tags:', 'R') - failed_group_count = self._count_groups_by_keys(real_failure_group) + failed_group_count = self._count_groups_by_keys(failed_to_assign) for tags in failed_group_count: console_log('\t{}: {}'.format(tags, failed_group_count[tags]), 'R') raise RuntimeError('Failed to assign test case to CI jobs') From b37336f8b45cd35ddb1ac4979ade4bed2f9d556a Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Fri, 25 Mar 2022 12:24:51 +0800 Subject: [PATCH 2/4] Revert "ci: temporarily disable S3 target tests" This reverts commit 8df02332c1eeb1eb306e4e9cbd8fcdc1032114b5. --- .gitlab/ci/target-test.yml | 81 ++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 43 deletions(-) diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index 6c08c4780f..82482406ed 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -41,16 +41,15 @@ example_test_pytest_esp32s2_generic: TARGET: ESP32S2 ENV_MARKER: generic -# Temporary disabled until S3 runners are added, IDFCI-1171 -# example_test_pytest_esp32s3_generic: -# extends: -# - .pytest_examples_dir_template -# - .rules:test:example_test-esp32s3 -# needs: -# - build_pytest_examples_esp32s3 -# variables: -# TARGET: ESP32S3 -# ENV_MARKER: generic +example_test_pytest_esp32s3_generic: + extends: + - .pytest_examples_dir_template + - .rules:test:example_test-esp32s3 + needs: + - build_pytest_examples_esp32s3 + variables: + TARGET: ESP32S3 + ENV_MARKER: generic example_test_pytest_esp32c3_generic: extends: @@ -117,16 +116,15 @@ component_ut_pytest_esp32s2_generic: TARGET: ESP32S2 ENV_MARKER: generic -# Temporary disabled until S3 runners are added, IDFCI-1171 -# component_ut_pytest_esp32s3_generic: -# extends: -# - .pytest_components_dir_template -# - .rules:test:component_ut-esp32s3 -# needs: -# - build_pytest_components_esp32s3 -# variables: -# TARGET: ESP32S3 -# ENV_MARKER: generic +component_ut_pytest_esp32s3_generic: + extends: + - .pytest_components_dir_template + - .rules:test:component_ut-esp32s3 + needs: + - build_pytest_components_esp32s3 + variables: + TARGET: ESP32S3 + ENV_MARKER: generic component_ut_pytest_esp32s3_octal_psram: extends: @@ -175,16 +173,15 @@ test_app_test_pytest_esp32s2_generic: ENV_MARKER: generic SETUP_TOOLS: "1" # need gdb -# Temporary disabled until S3 runners are added, IDFCI-1171 -# test_app_test_pytest_esp32s3_generic: -# extends: -# - .pytest_test_apps_dir_template -# - .rules:test:custom_test-esp32s3 -# needs: -# - build_pytest_test_apps_esp32s3 -# variables: -# TARGET: ESP32S3 -# ENV_MARKER: generic +test_app_test_pytest_esp32s3_generic: + extends: + - .pytest_test_apps_dir_template + - .rules:test:custom_test-esp32s3 + needs: + - build_pytest_test_apps_esp32s3 + variables: + TARGET: ESP32S3 + ENV_MARKER: generic test_app_test_pytest_esp32c3_generic: extends: @@ -492,12 +489,11 @@ example_test_ESP32_SDSPI: - ESP32 - UT_T1_SPIMODE -# Temporary disabled until S3 runners are added, IDFCI-1171 -# example_test_S3_GENERIC: -# extends: .example_test_esp32s3_template -# tags: -# - ESP32S3 -# - Example_GENERIC +example_test_S3_GENERIC: + extends: .example_test_esp32s3_template + tags: + - ESP32S3 + - Example_GENERIC example_test_ESP32S2_SDSPI: extends: .example_test_esp32s2_template @@ -873,13 +869,12 @@ UT_C3_SDSPI: - ESP32C3_IDF - UT_T1_SPIMODE -# Temporary disabled until S3 runners are added, IDFCI-1171 -# UT_S3: -# extends: .unit_test_esp32s3_template -# parallel: 44 -# tags: -# - ESP32S3_IDF -# - UT_T1_1 +UT_S3: + extends: .unit_test_esp32s3_template + parallel: 44 + tags: + - ESP32S3_IDF + - UT_T1_1 UT_S3_SPI_DUAL: extends: .unit_test_esp32s3_template From 9bb9b58b3b3434c08e6537cb399fa9b068589f84 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Fri, 25 Mar 2022 12:56:58 +0800 Subject: [PATCH 3/4] ci: rename all the generic s3 tag to generic_s3_fixme --- .gitlab/ci/target-test.yml | 6 +++--- conftest.py | 3 +++ pytest.ini | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index 82482406ed..988b735a46 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -49,7 +49,7 @@ example_test_pytest_esp32s3_generic: - build_pytest_examples_esp32s3 variables: TARGET: ESP32S3 - ENV_MARKER: generic + ENV_MARKER: generic_s3_fixme example_test_pytest_esp32c3_generic: extends: @@ -124,7 +124,7 @@ component_ut_pytest_esp32s3_generic: - build_pytest_components_esp32s3 variables: TARGET: ESP32S3 - ENV_MARKER: generic + ENV_MARKER: generic_s3_fixme component_ut_pytest_esp32s3_octal_psram: extends: @@ -181,7 +181,7 @@ test_app_test_pytest_esp32s3_generic: - build_pytest_test_apps_esp32s3 variables: TARGET: ESP32S3 - ENV_MARKER: generic + ENV_MARKER: generic_s3_fixme test_app_test_pytest_esp32c3_generic: extends: diff --git a/conftest.py b/conftest.py index 4e8f68f232..76c536ce2e 100644 --- a/conftest.py +++ b/conftest.py @@ -244,6 +244,9 @@ class IdfPytestEmbedded: if 'all_targets' in item_marker_names(item): for _target in [*SUPPORTED_TARGETS, *PREVIEW_TARGETS]: item.add_marker(_target) + # FIXME: temporarily modify the s3 runner tag "generic" to "s3_generic" due to the deep sleep bug + if 'generic' in item_marker_names(item) and 'esp32s3' in item_marker_names(item): + item.add_marker('generic_s3_fixme') # filter all the test cases with "--target" if self.target: diff --git a/pytest.ini b/pytest.ini index f385185d8e..8a09b5d88a 100644 --- a/pytest.ini +++ b/pytest.ini @@ -25,6 +25,7 @@ markers = # env markers generic: tests should be run on generic runners + generic_s3_fixme: temporary workaround s3 runner flash_suspend: support flash suspend feature ip101: connected via wired 10/100M ethernet lan8720: connected via LAN8720 ethernet transceiver From 65354d74b3f8693c2b7adb8bfde49dd8aa3efbdb Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Fri, 25 Mar 2022 12:57:15 +0800 Subject: [PATCH 4/4] ci: remove unused jobs --- .gitlab/ci/target-test.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index 988b735a46..73eee00322 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -312,7 +312,7 @@ example_test_001B_V3: example_test_001C: extends: .example_test_esp32_template - parallel: 4 + parallel: 2 tags: - ESP32 - Example_GENERIC @@ -466,7 +466,7 @@ example_test_017: example_test_C3_GENERIC: extends: .example_test_esp32c3_template - parallel: 3 + parallel: 2 tags: - ESP32C3 - Example_GENERIC @@ -489,12 +489,6 @@ example_test_ESP32_SDSPI: - ESP32 - UT_T1_SPIMODE -example_test_S3_GENERIC: - extends: .example_test_esp32s3_template - tags: - - ESP32S3 - - Example_GENERIC - example_test_ESP32S2_SDSPI: extends: .example_test_esp32s2_template tags: