From fc1f4ee2bae38b98527b71e5c0b0650f7aa5c7e6 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Wed, 7 Dec 2022 09:34:18 +0800 Subject: [PATCH] ci: add pytest example jtag job --- .gitlab/ci/build.yml | 63 ++++++++++++++++++++++++++++++++++---- .gitlab/ci/target-test.yml | 2 +- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml index 014c00889d..d6d2061346 100644 --- a/.gitlab/ci/build.yml +++ b/.gitlab/ci/build.yml @@ -129,9 +129,52 @@ --parallel-count ${CI_NODE_TOTAL:-1} --parallel-index ${CI_NODE_INDEX:-1} +.build_pytest_no_jtag_template: + extends: .build_pytest_template + script: + # CI specific options start from "--collect-size-info xxx". could ignore when running locally + - run_cmd python tools/ci/ci_build_apps.py $TEST_DIR -v + -t $IDF_TARGET + -m \"not host_test and not jtag\" + --pytest-apps + --collect-size-info size_info.txt + --parallel-count ${CI_NODE_TOTAL:-1} + --parallel-index ${CI_NODE_INDEX:-1} + +.build_pytest_jtag_template: + extends: + - .build_cmake_template + - .before_script_build_jobs + artifacts: + paths: + - "**/build*/size.json" + - "**/build*/build_log.txt" + - "**/build*/*.bin" + # upload to s3 server to save the artifacts size + # - "**/build*/*.map" + - "**/build*/*.elf" # need elf for gdb + - "**/build*/flasher_args.json" + - "**/build*/flash_project_args" + - "**/build*/config/sdkconfig.json" + - "**/build*/bootloader/*.bin" + - "**/build*/partition_table/*.bin" + - list_job_*.json + - size_info.txt + when: always + expire_in: 4 days + script: + # CI specific options start from "--collect-size-info xxx". could ignore when running locally + - run_cmd python tools/ci/ci_build_apps.py $TEST_DIR -v + -t $IDF_TARGET + -m \"not host_test and jtag\" + --pytest-apps + --collect-size-info size_info.txt + --parallel-count ${CI_NODE_TOTAL:-1} + --parallel-index ${CI_NODE_INDEX:-1} + build_pytest_examples_esp32: extends: - - .build_pytest_template + - .build_pytest_no_jtag_template - .rules:build:example_test-esp32 parallel: 4 variables: @@ -140,7 +183,7 @@ build_pytest_examples_esp32: build_pytest_examples_esp32s2: extends: - - .build_pytest_template + - .build_pytest_no_jtag_template - .rules:build:example_test-esp32s2 parallel: 3 variables: @@ -149,7 +192,7 @@ build_pytest_examples_esp32s2: build_pytest_examples_esp32s3: extends: - - .build_pytest_template + - .build_pytest_no_jtag_template - .rules:build:example_test-esp32s3 parallel: 4 variables: @@ -158,7 +201,7 @@ build_pytest_examples_esp32s3: build_pytest_examples_esp32c3: extends: - - .build_pytest_template + - .build_pytest_no_jtag_template - .rules:build:example_test-esp32c3 parallel: 3 variables: @@ -167,7 +210,7 @@ build_pytest_examples_esp32c3: build_pytest_examples_esp32c2: extends: - - .build_pytest_template + - .build_pytest_no_jtag_template - .rules:build:example_test-esp32c2 variables: IDF_TARGET: esp32c2 @@ -175,12 +218,20 @@ build_pytest_examples_esp32c2: build_pytest_examples_esp32h4: extends: - - .build_pytest_template + - .build_pytest_no_jtag_template - .rules:build:example_test-esp32h4 variables: IDF_TARGET: esp32h4 TEST_DIR: examples +build_pytest_examples_jtag: # for all targets + extends: + - .build_pytest_jtag_template + - .rules:build:example_test-esp32 + variables: + IDF_TARGET: all + TEST_DIR: examples + build_pytest_components_esp32h4: extends: - .build_pytest_template diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index eb590652e6..d438fa87d0 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -82,7 +82,7 @@ example_test_pytest_esp32_jtag: - .pytest_examples_dir_template - .rules:test:example_test-esp32 needs: - - build_pytest_examples_esp32 + - build_pytest_examples_jtag tags: [ esp32, jtag ] variables: SETUP_TOOLS: "1" # need gdb openocd