ci: divide esp32s3 jobs into dual and single core

espressif · Jul 16, 2024 · 7478ed7 · 7478ed7
1 parent 3ef0b06
commit 7478ed7
Show file tree

Hide file tree

Showing 8 changed files with 217 additions and 60 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -266,7 +266,8 @@ 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_esp32s3_idf5.0.x_dual
+ - job: tests_armhf_esp32s3_idf5.0.x_single
  - job: tests_armhf_esp32c2_idf5.0.x
  - job: tests_armhf_esp32c3_idf5.0.x
  - job: tests_armhf_esp32c3_idf5.0.x_flash_encrypted
@@ -275,7 +276,8 @@ create_coverage_reports:
  - job: tests_armhf_esp32_idf5.1.x_flash_encrypted
  - job: tests_armhf_esp32s2_idf5.1.x
  - job: tests_armhf_esp32s2_idf5.1.x_flash_encrypted
- - job: tests_armhf_esp32s3_idf5.1.x
+ - job: tests_armhf_esp32s3_idf5.1.x_dual
+ - job: tests_armhf_esp32s3_idf5.1.x_single
  - job: tests_armhf_esp32c2_idf5.1.x
  - job: tests_armhf_esp32c3_idf5.1.x
  - job: tests_armhf_esp32c3_idf5.1.x_flash_encrypted
@@ -286,7 +288,8 @@ create_coverage_reports:
  - 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_esp32s3_idf5.2.x_dual
+ - job: tests_armhf_esp32s3_idf5.2.x_single
  - job: tests_armhf_esp32c2_idf5.2.x
  - job: tests_armhf_esp32c3_idf5.2.x
  - job: tests_armhf_esp32c3_idf5.2.x_flash_encrypted
@@ -297,7 +300,8 @@ create_coverage_reports:
  - job: tests_armhf_esp32_flash_encrypted
  - job: tests_armhf_esp32s2
  - job: tests_armhf_esp32s2_flash_encrypted
- - job: tests_armhf_esp32s3
+ - job: tests_armhf_esp32s3_dual
+ - job: tests_armhf_esp32s3_single
  - job: tests_armhf_esp32c2
  - job: tests_armhf_esp32c3
  - job: tests_armhf_esp32c3_flash_encrypted

diff --git a/.gitlab/ci/build-test-app.yml b/.gitlab/ci/build-test-app.yml
@@ -189,15 +189,25 @@ build_test_app_esp32s2:
  CHIP_NAME: "esp32s2"
  TOOLCHAIN_PREFIX: "xtensa-esp32s2"
  BUILD_TEST_APP_DIR: "build_test_app_esp32s2"
- TEST_APP_CONFIGS: "single_core single_core_encrypted svtrace_single apptrace_gcov_single psram_single"
+ TEST_APP_CONFIGS: "single_core single_core_encrypted svtrace_single apptrace_gcov_single psram_single single_core_amazon_freertos"
+ TEST_APP_BUILD_TOOLCHAIN_PREFIX: xtensa-esp
+ extends: .build_idf_master_test_app_template
+
+build_test_app_esp32s3_dual:
+ variables:
+ CHIP_NAME: "esp32s3"
+ TOOLCHAIN_PREFIX: "xtensa-esp32s3"
+ BUILD_TEST_APP_DIR: "build_test_app_esp32s3_dual"
+ TEST_APP_CONFIGS: "default svtrace_dual apptrace_gcov_dual psram_dual default_amazon_freertos"
  TEST_APP_BUILD_TOOLCHAIN_PREFIX: xtensa-esp
  extends: .build_idf_master_test_app_template
 
-build_test_app_esp32s3:
+build_test_app_esp32s3_single:
  variables:
  CHIP_NAME: "esp32s3"
  TOOLCHAIN_PREFIX: "xtensa-esp32s3"
- BUILD_TEST_APP_DIR: "build_test_app_esp32s3"
+ BUILD_TEST_APP_DIR: "build_test_app_esp32s3_single"
+ TEST_APP_CONFIGS: "single_core svtrace_single apptrace_gcov_single psram_single single_core_amazon_freertos"
  TEST_APP_BUILD_TOOLCHAIN_PREFIX: xtensa-esp
  extends: .build_idf_master_test_app_template
 
@@ -206,31 +216,31 @@ build_test_app_esp32c2:
  CHIP_NAME: "esp32c2"
  TOOLCHAIN_PREFIX: "riscv32-esp"
  BUILD_TEST_APP_DIR: "build_test_app_esp32c2"
- TEST_APP_CONFIGS: "single_core single_core_4MB svtrace_single apptrace_gcov_single"
+ TEST_APP_CONFIGS: "single_core single_core_4MB svtrace_single apptrace_gcov_single single_core_amazon_freertos"
  extends: .build_idf_master_test_app_template
 
 build_test_app_esp32c3:
  variables:
  CHIP_NAME: "esp32c3"
  TOOLCHAIN_PREFIX: "riscv32-esp"
  BUILD_TEST_APP_DIR: "build_test_app_esp32c3"
- TEST_APP_CONFIGS: "single_core single_core_encrypted svtrace_single apptrace_gcov_single"
+ TEST_APP_CONFIGS: "single_core single_core_encrypted svtrace_single apptrace_gcov_single single_core_amazon_freertos"
  extends: .build_idf_master_test_app_template
 
 build_test_app_esp32c6:
  variables:
  CHIP_NAME: "esp32c6"
  TOOLCHAIN_PREFIX: "riscv32-esp"
  BUILD_TEST_APP_DIR: "build_test_app_esp32c6"
- TEST_APP_CONFIGS: "single_core single_core_4MB svtrace_single apptrace_gcov_single"
+ TEST_APP_CONFIGS: "single_core single_core_4MB svtrace_single apptrace_gcov_single single_core_amazon_freertos"
  extends: .build_idf_master_test_app_template
 
 build_test_app_esp32h2:
  variables:
  CHIP_NAME: "esp32h2"
  TOOLCHAIN_PREFIX: "riscv32-esp"
  BUILD_TEST_APP_DIR: "build_test_app_esp32h2"
- TEST_APP_CONFIGS: "single_core single_core_4MB svtrace_single apptrace_gcov_single"
+ TEST_APP_CONFIGS: "single_core single_core_4MB svtrace_single apptrace_gcov_single single_core_amazon_freertos"
  extends: .build_idf_master_test_app_template
 
 ##############
@@ -254,11 +264,21 @@ build_test_app_esp32s2_idf5.2.x:
  TEST_APP_CONFIGS: "single_core single_core_encrypted svtrace_single apptrace_gcov_single psram_single"
  extends: .build_idf52x_test_app_template
 
-build_test_app_esp32s3_idf5.2.x:
+build_test_app_esp32s3_idf5.2.x_dual:
  variables:
  CHIP_NAME: "esp32s3"
  TOOLCHAIN_PREFIX: "xtensa-esp32s3"
- BUILD_TEST_APP_DIR: "build_test_app_esp32s3_idf5.2.x"
+ BUILD_TEST_APP_DIR: "build_test_app_esp32s3_idf5.2.x_dual"
+ TEST_APP_CONFIGS: "default svtrace_dual apptrace_gcov_dual psram_dual"
+ TEST_APP_BUILD_TOOLCHAIN_PREFIX: xtensa-esp
+ extends: .build_idf52x_test_app_template
+
+build_test_app_esp32s3_idf5.2.x_single:
+ variables:
+ CHIP_NAME: "esp32s3"
+ TOOLCHAIN_PREFIX: "xtensa-esp32s3"
+ BUILD_TEST_APP_DIR: "build_test_app_esp32s3_idf5.2.x_single"
+ TEST_APP_CONFIGS: "single_core svtrace_single apptrace_gcov_single psram_single"
  TEST_APP_BUILD_TOOLCHAIN_PREFIX: xtensa-esp
  extends: .build_idf52x_test_app_template
 
@@ -313,11 +333,20 @@ build_test_app_esp32s2_idf5.1.x:
  TEST_APP_CONFIGS: "single_core single_core_encrypted svtrace_single apptrace_gcov_single psram_single"
  extends: .build_idf51x_test_app_template
 
-build_test_app_esp32s3_idf5.1.x:
+build_test_app_esp32s3_idf5.1.x_dual:
  variables:
  CHIP_NAME: "esp32s3"
  TOOLCHAIN_PREFIX: "xtensa-esp32s3"
- BUILD_TEST_APP_DIR: "build_test_app_esp32s3_idf5.1.x"
+ BUILD_TEST_APP_DIR: "build_test_app_esp32s3_idf5.1.x_dual"
+ TEST_APP_CONFIGS: "default svtrace_dual apptrace_gcov_dual psram_dual"
+ extends: .build_idf51x_test_app_template
+
+build_test_app_esp32s3_idf5.1.x_single:
+ variables:
+ CHIP_NAME: "esp32s3"
+ TOOLCHAIN_PREFIX: "xtensa-esp32s3"
+ BUILD_TEST_APP_DIR: "build_test_app_esp32s3_idf5.1.x_single"
+ TEST_APP_CONFIGS: "single_core svtrace_single apptrace_gcov_single psram_single"
  extends: .build_idf51x_test_app_template
 
 build_test_app_esp32c2_idf5.1.x:
@@ -371,11 +400,20 @@ build_test_app_esp32s2_idf5.0.x:
  TEST_APP_CONFIGS: "single_core single_core_encrypted svtrace_single apptrace_gcov_single psram_single"
  extends: .build_idf50x_test_app_template
 
-build_test_app_esp32s3_idf5.0.x:
+build_test_app_esp32s3_idf5.0.x_dual:
+ variables:
+ CHIP_NAME: "esp32s3"
+ TOOLCHAIN_PREFIX: "xtensa-esp32s3"
+ BUILD_TEST_APP_DIR: "build_test_app_esp32s3_idf5.0.x_dual"
+ TEST_APP_CONFIGS: "default svtrace_dual apptrace_gcov_dual psram_dual"
+ extends: .build_idf50x_test_app_template
+
+build_test_app_esp32s3_idf5.0.x_single:
  variables:
  CHIP_NAME: "esp32s3"
  TOOLCHAIN_PREFIX: "xtensa-esp32s3"
- BUILD_TEST_APP_DIR: "build_test_app_esp32s3_idf5.0.x"
+ BUILD_TEST_APP_DIR: "build_test_app_esp32s3_idf5.0.x_single"
+ TEST_APP_CONFIGS: "single_core svtrace_single apptrace_gcov_single psram_single"
  extends: .build_idf50x_test_app_template
 
 build_test_app_esp32c2_idf5.0.x:

diff --git a/.gitlab/ci/test-sanitizers.yml b/.gitlab/ci/test-sanitizers.yml
@@ -129,14 +129,23 @@ tests_sanitizers_esp32s2:
  CHIP_NAME: "esp32s2"
  TEST_RUN_EXTRA_OPTS: "-i latest -b esp32s2-devkitj -p test_*.*Single"
 
-tests_sanitizers_esp32s3:
+tests_sanitizers_esp32s3_dual:
  extends: .tests_sanitizers_master_template
  needs:
- - job: build_test_app_esp32s3
+ - job: build_test_app_esp32s3_dual
  - job: build_linux_armhf_sanitizer_test
  variables:
  CHIP_NAME: "esp32s3"
- TEST_RUN_EXTRA_OPTS: "-i latest -b esp32s3-ftdi -p test_*.*Single test_*.*Dual"
+ TEST_RUN_EXTRA_OPTS: "-i latest -b esp32s3-ftdi -p test_*.*Dual"
+
+tests_sanitizers_esp32s3_single:
+ extends: .tests_sanitizers_master_template
+ needs:
+ - job: build_test_app_esp32s3_single
+ - job: build_linux_armhf_sanitizer_test
+ variables:
+ CHIP_NAME: "esp32s3"
+ TEST_RUN_EXTRA_OPTS: "-i latest -b esp32s3-ftdi -p test_*.Single"
 
 tests_sanitizers_esp32c2:
  extends: .tests_sanitizers_master_riscv_template
@@ -202,14 +211,23 @@ tests_sanitizers_esp32s2_idf5.2.x:
  CHIP_NAME: "esp32s2"
  TEST_RUN_EXTRA_OPTS: "-i $TEST_APP_IDF5_2_X_RELEASE_TAG -b esp32s2-devkitj -p test_*.*Single"
 
-tests_sanitizers_esp32s3_idf5.2.x:
+tests_sanitizers_esp32s3_idf5.2.x_dual:
+ extends: .tests_sanitizers_v5.2.x_template
+ needs:
+ - job: build_test_app_esp32s3_idf5.2.x_dual
+ - job: build_linux_armhf_sanitizer_test
+ variables:
+ CHIP_NAME: "esp32s3"
+ TEST_RUN_EXTRA_OPTS: "-i $TEST_APP_IDF5_2_X_RELEASE_TAG -b esp32s3-ftdi -p test_*.*Dual"
+
+tests_sanitizers_esp32s3_idf5.2.x_single:
  extends: .tests_sanitizers_v5.2.x_template
  needs:
- - job: build_test_app_esp32s3_idf5.2.x
+ - job: build_test_app_esp32s3_idf5.2.x_single
  - job: build_linux_armhf_sanitizer_test
  variables:
  CHIP_NAME: "esp32s3"
- TEST_RUN_EXTRA_OPTS: "-i $TEST_APP_IDF5_2_X_RELEASE_TAG -b esp32s3-ftdi -p test_*.*Single test_*.*Dual"
+ TEST_RUN_EXTRA_OPTS: "-i $TEST_APP_IDF5_2_X_RELEASE_TAG -b esp32s3-ftdi -p test_*.*Single"
 
 tests_sanitizers_esp32c2_idf5.2.x:
  extends: .tests_sanitizers_v5.2.x_riscv_template
@@ -275,14 +293,23 @@ tests_sanitizers_esp32s2_idf5.1.x:
  CHIP_NAME: "esp32s2"
  TEST_RUN_EXTRA_OPTS: "-i $TEST_APP_IDF5_1_X_RELEASE_TAG -b esp32s2-devkitj -p test_*.*Single"
 
-tests_sanitizers_esp32s3_idf5.1.x:
+tests_sanitizers_esp32s3_idf5.1.x_dual:
  extends: .tests_sanitizers_v5.1.x_template
  needs:
- - job: build_test_app_esp32s3_idf5.1.x
+ - job: build_test_app_esp32s3_idf5.1.x_dual
  - job: build_linux_armhf_sanitizer_test
  variables:
  CHIP_NAME: "esp32s3"
- TEST_RUN_EXTRA_OPTS: "-i $TEST_APP_IDF5_1_X_RELEASE_TAG -b esp32s3-builtin -p test_*.*Single test_*.*Dual"
+ TEST_RUN_EXTRA_OPTS: "-i $TEST_APP_IDF5_1_X_RELEASE_TAG -b esp32s3-builtin -p test_*.*Dual"
+
+tests_sanitizers_esp32s3_idf5.1.x_single:
+ extends: .tests_sanitizers_v5.1.x_template
+ needs:
+ - job: build_test_app_esp32s3_idf5.1.x_single
+ - job: build_linux_armhf_sanitizer_test
+ variables:
+ CHIP_NAME: "esp32s3"
+ TEST_RUN_EXTRA_OPTS: "-i $TEST_APP_IDF5_1_X_RELEASE_TAG -b esp32s3-builtin -p test_*.*Single"
 
 tests_sanitizers_esp32c2_idf5.1.x:
  extends: .tests_sanitizers_v5.1.x_riscv_template
@@ -348,14 +375,23 @@ tests_sanitizers_esp32s2_idf5.0.x:
  CHIP_NAME: "esp32s2"
  TEST_RUN_EXTRA_OPTS: "-i $TEST_APP_IDF5_0_X_RELEASE_TAG -b esp32s2-devkitj -p test_*.*Single"
 
-tests_sanitizers_esp32s3_idf5.0.x:
+tests_sanitizers_esp32s3_idf5.0.x_dual:
+ extends: .tests_sanitizers_v5.0.x_template
+ needs:
+ - job: build_test_app_esp32s3_idf5.0.x_dual
+ - job: build_linux_armhf_sanitizer_test
+ variables:
+ CHIP_NAME: "esp32s3"
+ TEST_RUN_EXTRA_OPTS: "-i $TEST_APP_IDF5_0_X_RELEASE_TAG -b esp32s3-ftdi -p test_*.*Dual"
+
+tests_sanitizers_esp32s3_idf5.0.x_single:
  extends: .tests_sanitizers_v5.0.x_template
  needs:
- - job: build_test_app_esp32s3_idf5.0.x
+ - job: build_test_app_esp32s3_idf5.0.x_single
  - job: build_linux_armhf_sanitizer_test
  variables:
  CHIP_NAME: "esp32s3"
- TEST_RUN_EXTRA_OPTS: "-i $TEST_APP_IDF5_0_X_RELEASE_TAG -b esp32s3-ftdi -p test_*.*Single test_*.*Dual"
+ TEST_RUN_EXTRA_OPTS: "-i $TEST_APP_IDF5_0_X_RELEASE_TAG -b esp32s3-ftdi -p test_*.*Single"
 
 tests_sanitizers_esp32c2_idf5.0.x:
  extends: .tests_sanitizers_v5.0.x_riscv_template
@@ -505,37 +541,69 @@ sanitizer_check_armhf_esp32s2_idf5.0.x:
  variables:
  TEST_RUN_DIR: "build_test_app_esp32s2_idf5.0.x"
 
-sanitizer_check_armhf_esp32s3:
+sanitizer_check_armhf_esp32s3_dual:
  <<: *sanitizer_check_armhf
  stage: sanitizer_check_idf_master
  needs:
- - job: tests_sanitizers_esp32s3
+ - job: tests_sanitizers_esp32s3_dual
+ variables:
+ TEST_RUN_DIR: "build_test_app_esp32s3_dual"
+
+sanitizer_check_armhf_esp32s3_single:
+ <<: *sanitizer_check_armhf
+ stage: sanitizer_check_idf_master
+ needs:
+ - job: tests_sanitizers_esp32s3_single
+ variables:
+ TEST_RUN_DIR: "build_test_app_esp32s3_single"
+
+sanitizer_check_armhf_esp32s3_idf5.2.x_dual:
+ <<: *sanitizer_check_armhf
+ stage: sanitizer_check_idf5.2.x
+ needs:
+ - job: tests_sanitizers_esp32s3_idf5.2.x_dual
  variables:
- TEST_RUN_DIR: "build_test_app_esp32s3"
+ TEST_RUN_DIR: "build_test_app_esp32s3_idf5.2.x_dual"
 
-sanitizer_check_armhf_esp32s3_idf5.2.x:
+sanitizer_check_armhf_esp32s3_idf5.2.x_single:
  <<: *sanitizer_check_armhf
  stage: sanitizer_check_idf5.2.x
  needs:
- - job: tests_sanitizers_esp32s3_idf5.2.x
+ - job: tests_sanitizers_esp32s3_idf5.2.x_single
+ variables:
+ TEST_RUN_DIR: "build_test_app_esp32s3_idf5.2.x_single"
+
+sanitizer_check_armhf_esp32s3_idf5.1.x_dual:
+ <<: *sanitizer_check_armhf
+ stage: sanitizer_check_idf5.1.x
+ needs:
+ - job: tests_sanitizers_esp32s3_idf5.1.x_dual
  variables:
- TEST_RUN_DIR: "build_test_app_esp32s3_idf5.2.x"
+ TEST_RUN_DIR: "build_test_app_esp32s3_idf5.1.x_dual"
 
-sanitizer_check_armhf_esp32s3_idf5.1.x:
+sanitizer_check_armhf_esp32s3_idf5.1.x_single:
  <<: *sanitizer_check_armhf
  stage: sanitizer_check_idf5.1.x
  needs:
- - job: tests_sanitizers_esp32s3_idf5.1.x
+ - job: tests_sanitizers_esp32s3_idf5.1.x_single
+ variables:
+ TEST_RUN_DIR: "build_test_app_esp32s3_idf5.1.x_single"
+
+sanitizer_check_armhf_esp32s3_idf5.0.x_dual:
+ <<: *sanitizer_check_armhf
+ stage: sanitizer_check_idf5.0.x
+ needs:
+ - job: tests_sanitizers_esp32s3_idf5.0.x_dual
  variables:
- TEST_RUN_DIR: "build_test_app_esp32s3_idf5.1.x"
+ TEST_RUN_DIR: "build_test_app_esp32s3_idf5.0.x_dual"
 
-sanitizer_check_armhf_esp32s3_idf5.0.x:
+sanitizer_check_armhf_esp32s3_idf5.0.x_single:
  <<: *sanitizer_check_armhf
  stage: sanitizer_check_idf5.0.x
  needs:
- - job: tests_sanitizers_esp32s3_idf5.0.x
+ - job: tests_sanitizers_esp32s3_idf5.0.x_single
  variables:
- TEST_RUN_DIR: "build_test_app_esp32s3_idf5.0.x"
+ TEST_RUN_DIR: "build_test_app_esp32s3_idf5.0.x_single"
 
 sanitizer_check_armhf_esp32c2:
  <<: *sanitizer_check_armhf