Merge branch 'ci/support_esp_board_manager' into 'main'

ci: Support_esp_board_manager

See merge request adf/multimedia/esp-gmf!204

Author: jason-mao

.gitlab/ci/build_examples.yml

@@ -30,19 +30,18 @@
   extends:
     - .build_template
   script:
-    - cd $CI_PROJECT_DIR
-    - pip install idf_build_apps
+    - python $CI_PROJECT_DIR/tools/ci/esp_bmgr_pre_build.py --target $IDF_TARGET --board $AUDIO_BOARD --project-path ${EXAMPLES_PATH[@]} --target-dir-type ${TARGET_DIR_TYPE}
     - run_cmd python $CI_PROJECT_DIR/tools/ci/build_apps.py ${EXAMPLES_PATH[@]} \
-                   -t $IDF_TARGET -vv \
-                   --target-dir-type ${TARGET_DIR_TYPE} \
-                   --build-dir ${IDF_VERSION_TAG}/build_@t_@w \
-                   --parallel-count ${parallel##*/} \
-                   --parallel-index ${parallel%%/*}
+        -t $IDF_TARGET -vv \
+        --target-dir-type ${TARGET_DIR_TYPE} \
+        --build-dir ${IDF_VERSION_TAG}/build_@t_@w \
+        --parallel-count ${parallel##*/} \
+        --parallel-index ${parallel%%/*}
 
 .matrix_template: &matrix_template
   parallel:
     matrix:
-      - IDF_VERSION_TAG: ['v5.3', 'v5.4']
+      - IDF_VERSION_TAG: ['v5.4.3']
         parallel: [ 1/1 ]
 
 build_examples_esp32_lyrat_mini_v1_1:
@@ -52,7 +51,7 @@ build_examples_esp32_lyrat_mini_v1_1:
     - .matrix_template
   variables:
     IDF_TARGET: esp32
-    AUDIO_BOARD: ESP_LYRAT_MINI_V1_1
+    AUDIO_BOARD: lyrat_mini_v1_1
 
 .build_examples_esp32s2_kaluga_v1_2:
   extends:
@@ -61,7 +60,7 @@ build_examples_esp32_lyrat_mini_v1_1:
     - .matrix_template
   variables:
     IDF_TARGET: esp32s2
-    AUDIO_BOARD: ESP32_S2_KALUGA_1_V1_2
+    AUDIO_BOARD: ''
 
 build_examples_esp32s3_korvo_v2:
   extends:
@@ -70,4 +69,4 @@ build_examples_esp32s3_korvo_v2:
     - .matrix_template
   variables:
     IDF_TARGET: esp32s3
-    AUDIO_BOARD: ESP32_S3_KORVO2_V3
+    AUDIO_BOARD: esp32_s3_korvo2_v3

.gitlab/ci/build_ut.yml

@@ -1,5 +1,4 @@
 variables:
-  DOCKER_IMAGE: ${CI_DOCKER_IMAGE_REGISTRY}/env_default:1
   BASE_FRAMEWORK_PATH: "${IDF_PATH}"
   BASE_FRAMEWORK: $IDF_REPOSITORY
   IDF_TAG_FLAG: true
@@ -11,7 +10,7 @@ variables:
     TEST_DIR: ${CI_PROJECT_DIR}/gmf_core
   parallel:
     matrix:
-      - IDF_VERSION_TAG: ['v5.4']
+      - IDF_VERSION_TAG: ['v5.4.3']
         parallel: [ 1/1 ]
   extends:
     - .rules:build:protected-merge-requests-pipeline
@@ -32,16 +31,14 @@ variables:
       - "${TEST_DIR}/**/test_apps/*.py"
     expire_in: 4 days
   script:
-    - cd ${CI_PROJECT_DIR}
+    - python $CI_PROJECT_DIR/tools/ci/esp_bmgr_pre_build.py --target $IDF_TARGET --board $AUDIO_BOARD --project-path ${TEST_DIR} --target-dir-type ${TARGET_DIR_TYPE}
     - run_cmd python $CI_PROJECT_DIR/tools/ci/build_apps.py ${TEST_DIR} \
-                -t $IDF_TARGET -vv \
-                --target-dir-type ${TARGET_DIR_TYPE} \
-                --build-dir ${IDF_VERSION_TAG}/build_@t_@w \
-                --parallel-count ${parallel##*/} \
-                --parallel-index ${parallel%%/*}
+        -t $IDF_TARGET -vv \
+        --target-dir-type ${TARGET_DIR_TYPE} \
+        --build-dir ${IDF_VERSION_TAG}/build_@t_@w \
+        --parallel-count ${parallel##*/} \
+        --parallel-index ${parallel%%/*}
     - python $CI_PROJECT_DIR/tools/ci/check_test_cxx_build.py
-  after_script:
-    - find "${TEST_DIR}" -type d -name "managed_components" -exec rm -rf {} +
 
 .build_ut_gmf_packages:
   extends:
@@ -60,6 +57,7 @@ build_ut_gmf_core_esp32:
     - .build_gmf_component
   variables:
     IDF_TARGET: esp32
+    AUDIO_BOARD: lyrat_mini_v1_1
 
 .build_ut_gmf_core_esp32c3:
   extends:
@@ -72,39 +70,46 @@ build_ut_gmf_core_esp32s3:
     - .build_gmf_component
   variables:
     IDF_TARGET: esp32s3
+    AUDIO_BOARD: esp32_s3_korvo2_v3
 
 .build_ut_gmf_core_esp32p4:
   extends:
     - .build_gmf_component
   variables:
     IDF_TARGET: esp32p4
+    AUDIO_BOARD: esp32_p4_function_ev
 
 build_ut_gmf_elements_esp32:
   extends:
     - .build_ut_gmf_elements
   variables:
     IDF_TARGET: esp32
+    AUDIO_BOARD: lyrat_mini_v1_1
 
 build_ut_gmf_elements_esp32s3:
   extends:
     - .build_ut_gmf_elements
   variables:
     IDF_TARGET: esp32s3
+    AUDIO_BOARD: esp32_s3_korvo2_v3
 
 .build_ut_gmf_elements_esp32p4:
   extends:
     - .build_ut_gmf_elements
   variables:
     IDF_TARGET: esp32p4
+    AUDIO_BOARD: esp32_p4_function_ev
 
 build_ut_gmf_packages_esp32:
   extends:
     - .build_ut_gmf_packages
   variables:
     IDF_TARGET: esp32
+    AUDIO_BOARD: lyrat_mini_v1_1
 
 build_ut_gmf_packages_esp32s3:
   extends:
     - .build_ut_gmf_packages
   variables:
     IDF_TARGET: esp32s3
+    AUDIO_BOARD: esp32_s3_korvo2_v3

.gitlab/ci/common.yml

@@ -1,25 +1,30 @@
 variables:
-  DOCKER_IMAGE: ${CI_DOCKER_IMAGE_REGISTRY}/env_v5.3:1
   IDF_TAG_FLAG: true
+  IDF_EXTRA_ACTIONS_PATH: ${CI_PROJECT_DIR}/packages/esp_board_manager
 
 .update_source: &update_source
   - source ${CI_PROJECT_DIR}/tools/ci/utils.sh
   - add_gitlab_ssh_keys
   - git submodule update --init --recursive --depth 1
+  - git clone --depth 1 -b $IDF_VERSION_TAG $IDF_REPOSITORY $IDF_PATH
+  - fetch_idf_branch $IDF_VERSION_TAG
   - cd $BASE_FRAMEWORK_PATH
   - git log -2
   - common_before_scripts
   - setup_tools_and_idf_python_venv
   - set_env_variable
+  - cd ${CI_PROJECT_DIR}
 
 .build_template:
   stage: build
-  image: ${DOCKER_IMAGE}
+  image: ${IMAGE}
   interruptible: true
   tags:
     - multimedia_build
   before_script:
     - *update_source
+  after_script:
+    - find "${TEST_DIR}" -type d \( -name "managed_components" -o -name "build" \) -exec rm -rf {} +
 
 .target_test_template:
   stage: target_test

.gitlab/ci/rules.yml

@@ -50,9 +50,9 @@
     IMAGE: "$CI_DOCKER_IMAGE_REGISTRY/env_v5.3:1"
 
 .idf-version-tag-v5-4: &idf-version-tag-v5-4
-  if: '$IDF_VERSION_TAG == "v5.4"'
+  if: '$IDF_VERSION_TAG == "v5.4.3"'
   variables:
-    IMAGE: "$CI_DOCKER_IMAGE_REGISTRY/env_default:1"
+    IMAGE: "$CI_IDF_DOCKER_REGISTRY/esp-env-v5.4:2"
 
 .rules:ref:main-schedule:
   rules:

.gitlab/ci/target_examples.yml

@@ -3,7 +3,7 @@
     - .target_test_template
   parallel:
     matrix:
-      - IDF_VERSION_TAG: ['v5.3', 'v5.4']
+      - IDF_VERSION_TAG: ['v5.4.3']
   variables:
     GIT_DEPTH: 1
     SUBMODULES_TO_FETCH: "none"
@@ -57,8 +57,7 @@ audio_playback_test_esp32:
   variables:
     IDF_TARGET: esp32
   needs:
-    - 'build_examples_esp32_lyrat_mini_v1_1: [v5.3, 1/1]'
-    - 'build_examples_esp32_lyrat_mini_v1_1: [v5.4, 1/1]'
+    - 'build_examples_esp32_lyrat_mini_v1_1: [v5.4.3, 1/1]'
   tags: [ esp32, AUDIO_LOOPBACK_ENV ]
 
 example_test_esp32s3:
@@ -67,6 +66,5 @@ example_test_esp32s3:
   variables:
     IDF_TARGET: esp32s3
   needs:
-    - 'build_examples_esp32s3_korvo_v2: [v5.3, 1/1]'
-    - 'build_examples_esp32s3_korvo_v2: [v5.4, 1/1]'
+    - 'build_examples_esp32s3_korvo_v2: [v5.4.3, 1/1]'
   tags: [ esp32s3 ]

.gitlab/ci/target_ut.yml

@@ -2,7 +2,7 @@
   extends:
     - .target_test_template
   variables:
-    IDF_VERSION_TAG: v5.4
+    IDF_VERSION_TAG: v5.4.3
     IDF_TAG_FLAG: true
     TARGET_DIR_TYPE: "test_apps"
   artifacts:
@@ -38,7 +38,7 @@ ut_gmf_core_esp32s3:
   extends:
     - .pytest_components_dir_template
   needs:
-    - 'build_ut_gmf_core_esp32s3: [v5.4, 1/1]'
+    - 'build_ut_gmf_core_esp32s3: [v5.4.3, 1/1]'
   variables:
     TEST_DIR: ${CI_PROJECT_DIR}/gmf_core
   tags: [ ESP32S3, ESP_GMF_COMPONENT ]
@@ -47,7 +47,7 @@ ut_gmf_elements_esp32s3:
   extends:
     - .pytest_components_dir_template
   needs:
-    - 'build_ut_gmf_elements_esp32s3: [v5.4, 1/1]'
+    - 'build_ut_gmf_elements_esp32s3: [v5.4.3, 1/1]'
   variables:
     TEST_DIR: ${CI_PROJECT_DIR}/elements
   tags: [ ESP32S3, ESP_GMF_COMPONENT ]
@@ -56,7 +56,7 @@ ut_gmf_packages_esp32s3:
   extends:
     - .pytest_components_dir_template
   needs:
-    - 'build_ut_gmf_packages_esp32s3: [v5.4, 1/1]'
+    - 'build_ut_gmf_packages_esp32s3: [v5.4.3, 1/1]'
   variables:
     TEST_DIR: ${CI_PROJECT_DIR}/packages
   tags: [ ESP32S3, ESP_GMF_COMPONENT ]

packages/esp_audio_render/examples/simple_piano/sdkconfig.defaults

@@ -10,9 +10,6 @@ CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y
 CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y
 CONFIG_FREERTOS_HZ=1000
 
-# Use new I2C master
-CONFIG_CODEC_I2C_BACKWARD_COMPATIBLE=n
-
 # Enable experimental features
 CONFIG_IDF_EXPERIMENTAL_FEATURES=y
 

packages/esp_board_manager/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.4.6
+
+### Bug Fixes
+
+- Fixed the SD card mount failure issue
+
 ## 0.4.5
 
 ### Bug Fixes

packages/esp_board_manager/boards/lyrat_mini_v1_1/board_devices.yaml

@@ -4,7 +4,7 @@ version: 1.0.0
 # Devices Configuration
 devices:
   # SD Card Power Control
-  - name: lcd_power
+  - name: sd_power
     type: gpio_ctrl
     version: default
     config:
@@ -18,7 +18,6 @@ devices:
     chip: es8311
     type: audio_codec
     version: default
-    skip_init: true
     config:
       dac_enabled: true
       dac_max_channel: 1
@@ -39,7 +38,6 @@ devices:
     chip: es7243e      # Some old boards use ES7243, ES7243 is EOL
     type: audio_codec
     version: default
-    # skip_init: true
     config:
       adc_enabled: true
       adc_max_channel: 2

packages/esp_board_manager/idf_component.yml

@@ -1,4 +1,4 @@
-version: 0.4.5
+version: 0.4.6
 description: Board manager for ESP-GMF
 url: https://github.com/espressif/esp-gmf/tree/main/packages/esp_board_manager
 documentation: https://github.com/espressif/esp-gmf/blob/main/packages/esp_board_manager/README.md