From 8df02332c1eeb1eb306e4e9cbd8fcdc1032114b5 Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Mon, 21 Mar 2022 12:49:28 +0800 Subject: [PATCH 1/3] ci: temporarily disable S3 target tests Disable running S3 target tests for now due to runner issues. --- .gitlab/ci/target-test.yml | 81 ++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 38 deletions(-) diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index 1463c76227..831cb9b95a 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -41,15 +41,16 @@ example_test_pytest_esp32s2_generic: TARGET: ESP32S2 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 +# 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_esp32c3_generic: extends: @@ -116,15 +117,16 @@ component_ut_pytest_esp32s2_generic: TARGET: ESP32S2 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 +# 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_octal_psram: extends: @@ -173,15 +175,16 @@ test_app_test_pytest_esp32s2_generic: ENV_MARKER: generic SETUP_TOOLS: "1" # need gdb -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 +# 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_esp32c3_generic: extends: @@ -479,11 +482,12 @@ example_test_ESP32_SDSPI: - ESP32 - UT_T1_SPIMODE -example_test_S3_GENERIC: - extends: .example_test_esp32s3_template - tags: - - ESP32S3 - - Example_GENERIC +# Temporary disabled until S3 runners are added, IDFCI-1171 +# example_test_S3_GENERIC: +# extends: .example_test_esp32s3_template +# tags: +# - ESP32S3 +# - Example_GENERIC example_test_ESP32S2_SDSPI: extends: .example_test_esp32s2_template @@ -859,12 +863,13 @@ UT_C3_SDSPI: - ESP32C3_IDF - UT_T1_SPIMODE -UT_S3: - extends: .unit_test_esp32s3_template - parallel: 44 - tags: - - ESP32S3_IDF - - UT_T1_1 +# 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_SPI_DUAL: extends: .unit_test_esp32s3_template From 8a31c528258f11b05606d838c80279d5395ce1ab Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Mon, 21 Mar 2022 13:45:52 +0800 Subject: [PATCH 2/3] ci: temporarily disable s3 assign test --- .../tiny_test_fw/Utility/CIAssignTest.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 0cad445f50..7d517c343c 100644 --- a/tools/ci/python_packages/tiny_test_fw/Utility/CIAssignTest.py +++ b/tools/ci/python_packages/tiny_test_fw/Utility/CIAssignTest.py @@ -312,11 +312,21 @@ 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(failed_to_assign) + failed_group_count = self._count_groups_by_keys(real_failure_group) 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 b25e896c256886b9226692ab1f020c1f32d00648 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 21 Mar 2022 17:01:37 +0100 Subject: [PATCH 3/3] ci: exclude spiffs submodule from flake8 checks --- .flake8 | 1 + 1 file changed, 1 insertion(+) diff --git a/.flake8 b/.flake8 index da1f8db83a..8bd15e05d0 100644 --- a/.flake8 +++ b/.flake8 @@ -149,6 +149,7 @@ exclude = components/openthread/openthread, components/tinyusb, components/unity/unity, + components/spiffs/spiffs, examples/build_system/cmake/import_lib/main/lib/tinyxml2, examples/peripherals/secure_element/atecc608_ecdsa/components/esp-cryptoauthlib, # autogenerated scripts