ci: add idf v5.2 tests

espressif · Mar 13, 2024 · 6d10d5c · 6d10d5c
1 parent 1cb2340
commit 6d10d5c
Show file tree

Hide file tree

Showing 6 changed files with 388 additions and 132 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -5,23 +5,27 @@ stages:
   - build_idf4.x
   - build_idf5.0.x
   - build_idf5.1.x
+  - build_idf5.2.x
   - build_idf_master
   - build_nuttx
   - test_idf4.x
   - test_idf5.0.x
   - test_idf5.1.x
+  - test_idf5.2.x
   - test_idf_master
   - test_host
   - test_nuttx
   - coverage
   - sanitizer_test_idf4.x
   - sanitizer_test_idf5.0.x
   - sanitizer_test_idf5.1.x
+  - sanitizer_test_idf5.2.x
   - sanitizer_test_idf_master
   - sanitizer_test_nuttx
   - sanitizer_check_idf4.x
   - sanitizer_check_idf5.0.x
   - sanitizer_check_idf5.1.x
+  - sanitizer_check_idf5.2.x
   - sanitizer_check_idf_master
   - sanitizer_check_nuttx
   - deploy
@@ -297,9 +301,9 @@ create_coverage_reports:
     - job: tests_armhf_esp32_idf5.0.x_flash_encrypted
     - job: tests_armhf_esp32s2_idf5.0.x
     - job: tests_armhf_esp32s2_idf5.0.x_flash_encrypted
+    - job: tests_armhf_esp32s3_idf5.0.x
     - job: tests_armhf_esp32c2_idf5.0.x
     - job: tests_armhf_esp32c3_idf5.0.x
-    - job: tests_armhf_esp32c3_idf5.0.x_builtin_usb_jtag
     - job: tests_armhf_esp32c3_idf5.0.x_flash_encrypted
     # idf 5.1.x
     - job: tests_armhf_esp32_idf5.1.x
@@ -309,10 +313,20 @@ create_coverage_reports:
     - job: tests_armhf_esp32s3_idf5.1.x
     - job: tests_armhf_esp32c2_idf5.1.x
     - job: tests_armhf_esp32c3_idf5.1.x
-    - job: tests_armhf_esp32c3_idf5.1.x_builtin_usb_jtag
     - job: tests_armhf_esp32c3_idf5.1.x_flash_encrypted
-    - job: tests_armhf_esp32c6_idf5.1.x_builtin_usb_jtag
-    - job: tests_armhf_esp32h2_idf5.1.x_builtin_usb_jtag
+    - job: tests_armhf_esp32c6_idf5.1.x
+    - job: tests_armhf_esp32h2_idf5.1.x
+    # idf 5.2.x
+    - job: tests_armhf_esp32_idf5.2.x
+    - job: tests_armhf_esp32_idf5.2.x_flash_encrypted
+    - job: tests_armhf_esp32s2_idf5.2.x
+    - job: tests_armhf_esp32s2_idf5.2.x_flash_encrypted
+    - job: tests_armhf_esp32s3_idf5.2.x
+    - job: tests_armhf_esp32c2_idf5.2.x
+    - job: tests_armhf_esp32c3_idf5.2.x
+    - job: tests_armhf_esp32c3_idf5.2.x_flash_encrypted
+    - job: tests_armhf_esp32c6_idf5.2.x
+    - job: tests_armhf_esp32h2_idf5.2.x
     # idf master
     - job: tests_armhf_esp32
     - job: tests_armhf_esp32_flash_encrypted
@@ -321,10 +335,9 @@ create_coverage_reports:
     - job: tests_armhf_esp32s3
     - job: tests_armhf_esp32c2
     - job: tests_armhf_esp32c3
-    - job: tests_armhf_esp32c3_builtin_usb_jtag
     - job: tests_armhf_esp32c3_flash_encrypted
-    - job: tests_armhf_esp32c6_builtin_usb_jtag
-    - job: tests_armhf_esp32h2_builtin_usb_jtag
+    - job: tests_armhf_esp32c6
+    - job: tests_armhf_esp32h2
     - job: test_nuttx_esp32
     - job: test_nuttx_esp32s2
     - job: test_nuttx_esp32s3
@@ -378,4 +391,3 @@ include:
   - '.gitlab/ci/test.yml'
   - '.gitlab/ci/test-sanitizers.yml'
   - '.gitlab/ci/pre-check.yml'
-
diff --git a/.gitlab/ci/build-test-app.yml b/.gitlab/ci/build-test-app.yml
@@ -30,6 +30,8 @@
       git ls-remote https://gitlab-ci-token:${BOT_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/espressif/esp-idf.git | grep "refs/heads/$CI_COMMIT_REF_NAME"
       test $? -eq 0 && echo "Use IDF branch \"$CI_COMMIT_REF_NAME\"" && TEST_APP_CUSTOM_BRANCH=$CI_COMMIT_REF_NAME
     fi
+  elif [ "${TEST_APP_IDF_DOCKER_IMAGE}" = "${TEST_APP_IDF5_2_RELEASE_DOCKER_IMAGE}" ] && [ -n "${TEST_APP_IDF5_2_BRANCH:-}" ]; then
+    TEST_APP_CUSTOM_BRANCH="$TEST_APP_IDF5_2_BRANCH"
   elif [ "${TEST_APP_IDF_DOCKER_IMAGE}" = "${TEST_APP_IDF5_1_RELEASE_DOCKER_IMAGE}" ] && [ -n "${TEST_APP_IDF5_1_BRANCH:-}" ]; then
     TEST_APP_CUSTOM_BRANCH="$TEST_APP_IDF5_1_BRANCH"
   elif [ "${TEST_APP_IDF_DOCKER_IMAGE}" = "${TEST_APP_IDF5_0_RELEASE_DOCKER_IMAGE}" ] && [ -n "${TEST_APP_IDF5_0_BRANCH:-}" ]; then
@@ -163,6 +165,14 @@
     UT_GET_IDF_VER: "1"
   extends: .build_test_app_template
 
+.build_idf52x_test_app_template: &build_idf52x_test_app_template
+  stage: build_idf5.2.x
+  variables:
+    TEST_APP_CONFIGS: ""
+    TEST_APP_IDF_DOCKER_IMAGE: "${TEST_APP_IDF5_2_RELEASE_DOCKER_IMAGE}"
+    UT_GET_IDF_VER: "1"
+  extends: .build_test_app_template
+
 .build_idf_master_test_app_template: &build_idf_master_test_app_template
   stage: build_idf_master
   allow_failure: true
@@ -233,6 +243,66 @@ build_test_app_esp32h2:
     TEST_APP_CONFIGS: "single_core svtrace_single apptrace_gcov_single"
   extends: .build_idf_master_test_app_template
 
+##############
+# IDF 5.2.X #
+##############
+
+build_test_app_esp32_idf5.2.x:
+  variables:
+    CHIP_NAME: "esp32"
+    TOOLCHAIN_PREFIX: "xtensa-esp32"
+    BUILD_TEST_APP_DIR: "build_test_app_esp32_idf5.2.x"
+    TEST_APP_BUILD_TOOLCHAIN_PREFIX: xtensa-esp
+  extends: .build_idf52x_test_app_template
+
+build_test_app_esp32s2_idf5.2.x:
+  variables:
+    CHIP_NAME: "esp32s2"
+    TOOLCHAIN_PREFIX: "xtensa-esp32s2"
+    BUILD_TEST_APP_DIR: "build_test_app_esp32s2_idf5.2.x"
+    TEST_APP_BUILD_TOOLCHAIN_PREFIX: xtensa-esp
+  extends: .build_idf52x_test_app_template
+
+build_test_app_esp32s3_idf5.2.x:
+  variables:
+    CHIP_NAME: "esp32s3"
+    TOOLCHAIN_PREFIX: "xtensa-esp32s3"
+    BUILD_TEST_APP_DIR: "build_test_app_esp32s3_idf5.2.x"
+    TEST_APP_BUILD_TOOLCHAIN_PREFIX: xtensa-esp
+  extends: .build_idf52x_test_app_template
+
+build_test_app_esp32c2_idf5.2.x:
+  variables:
+    CHIP_NAME: "esp32c2"
+    TOOLCHAIN_PREFIX: "riscv32-esp"
+    BUILD_TEST_APP_DIR: "build_test_app_esp32c2_idf5.2.x"
+    TEST_APP_CONFIGS: "single_core svtrace_single apptrace_gcov_single"
+  extends: .build_idf52x_test_app_template
+
+build_test_app_esp32c3_idf5.2.x:
+  variables:
+    CHIP_NAME: "esp32c3"
+    TOOLCHAIN_PREFIX: "riscv32-esp"
+    BUILD_TEST_APP_DIR: "build_test_app_esp32c3_idf5.2.x"
+    TEST_APP_CONFIGS: "single_core single_core_encrypted svtrace_single apptrace_gcov_single"
+  extends: .build_idf52x_test_app_template
+
+build_test_app_esp32c6_idf5.2.x:
+  variables:
+    CHIP_NAME: "esp32c6"
+    TOOLCHAIN_PREFIX: "riscv32-esp"
+    BUILD_TEST_APP_DIR: "build_test_app_esp32c6_idf5.2.x"
+    TEST_APP_CONFIGS: "single_core svtrace_single apptrace_gcov_single"
+  extends: .build_idf52x_test_app_template
+
+build_test_app_esp32h2_idf5.2.x:
+  variables:
+    CHIP_NAME: "esp32h2"
+    TOOLCHAIN_PREFIX: "riscv32-esp"
+    BUILD_TEST_APP_DIR: "build_test_app_esp32h2_idf5.2.x"
+    TEST_APP_CONFIGS: "single_core svtrace_single apptrace_gcov_single"
+  extends: .build_idf52x_test_app_template
+
 #############
 # IDF 5.1.X #
 #############