From b968c36daff9fef04b363237596ec8ca089b5015 Mon Sep 17 00:00:00 2001 From: Alex Lisitsyn Date: Mon, 29 Apr 2024 17:14:32 +0800 Subject: [PATCH] fix ci issues - log file and build time limitation --- .gitlab-ci.yml | 15 +++++++++++---- test/serial/mb_serial_master/main/master.c | 2 +- test/tcp/mb_tcp_master/main/tcp_master.c | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03fd272..ba1747a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -94,39 +94,46 @@ after_script: # The script below will build all test applications defined in environment variable $TEST_TARGETS - *check_idf_ver - cd ${TEST_DIR} - - python -m idf_build_apps build -v -p . + - python -m idf_build_apps build -v -p ${SUBDIR} --recursive --target all --default-build-targets ${TEST_TARGETS} --config "sdkconfig.ci.*=" --build-dir "build_@t_@w" + --build-log build_log.txt --check-warnings --ignore-warning-file ../tools/ignore_build_warnings.txt --collect-size-info $SIZE_INFO_LOCATION --manifest-rootpath . --manifest-file .build-test-rules.yml - --parallel-count ${CI_NODE_TOTAL:-1} - --parallel-index ${CI_NODE_INDEX:-1} # delete all other build artifacts, except esp32 - echo "delete build folders:" $(find . -type d -regex '^\./.*build_esp32[a-z]+[0-9]+[_a-z]*' -print -exec rm -rf {} +) - variables: TEST_TARGETS: "esp32" build_idf_master: extends: .build_pytest_template image: espressif/idf:latest + parallel: + matrix: + - SUBDIR: ["serial", "tcp", "generic"] variables: TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2 esp32p4" build_idf_v5.0: extends: .build_pytest_template image: espressif/idf:release-v5.0 + parallel: + matrix: + - SUBDIR: ["serial", "tcp", "generic"] variables: TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3" build_idf_v5.2: extends: .build_pytest_template image: espressif/idf:release-v5.2 + parallel: + matrix: + - SUBDIR: ["serial", "tcp", "generic"] variables: TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2" diff --git a/test/serial/mb_serial_master/main/master.c b/test/serial/mb_serial_master/main/master.c index bd88b7c..e6e0fd1 100644 --- a/test/serial/mb_serial_master/main/master.c +++ b/test/serial/mb_serial_master/main/master.c @@ -20,7 +20,7 @@ #define MASTER_MAX_CIDS num_device_parameters // Number of reading of parameters from slave -#define MASTER_MAX_RETRY 30 +#define MASTER_MAX_RETRY 10 // Timeout to update cid over Modbus #define UPDATE_CIDS_TIMEOUT_MS (500) diff --git a/test/tcp/mb_tcp_master/main/tcp_master.c b/test/tcp/mb_tcp_master/main/tcp_master.c index 0f98add..b47c622 100644 --- a/test/tcp/mb_tcp_master/main/tcp_master.c +++ b/test/tcp/mb_tcp_master/main/tcp_master.c @@ -33,7 +33,7 @@ #define MASTER_MAX_CIDS num_device_parameters // Number of reading of parameters from slave -#define MASTER_MAX_RETRY (30) +#define MASTER_MAX_RETRY (10) // Timeout to update cid over Modbus #define UPDATE_CIDS_TIMEOUT_MS (500)