From eb37150780cd0943247c47b206abda9d15f10359 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Wed, 18 Oct 2023 10:23:19 +0200 Subject: [PATCH] ci: add all nightly run env vars while checking --- .gitlab/ci/common.yml | 1 + examples/system/.build-test-rules.yml | 8 +++++++- tools/ci/check_build_test_rules.py | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitlab/ci/common.yml b/.gitlab/ci/common.yml index 1d661428c0..56b2a767fc 100644 --- a/.gitlab/ci/common.yml +++ b/.gitlab/ci/common.yml @@ -97,6 +97,7 @@ variables: if echo "$CI_MERGE_REQUEST_LABELS" | egrep "(^|,)include_nightly_run(,|$)"; then export INCLUDE_NIGHTLY_RUN="1" + export NIGHTLY_RUN="1" fi # configure cmake related flags diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml index 897380b8bc..10fc5a1537 100644 --- a/examples/system/.build-test-rules.yml +++ b/examples/system/.build-test-rules.yml @@ -66,6 +66,10 @@ examples/system/esp_timer: - if: IDF_TARGET in ["esp32p4"] temporary: true reason: target(s) is not supported yet # TODO: IDF-7529 + disable_test: + - if: IDF_TARGET in ["esp32c6", "esp32h2"] + temporary: true + reason: lack of runner depends_components: - esp_timer @@ -188,8 +192,10 @@ examples/system/ota/simple_ota_example: examples/system/perfmon: enable: - - if: IDF_TARGET in ["esp32", "esp32s2", "esp32s3"] + - if: IDF_TARGET in ["esp32", "esp32s2", "esp32s3"] and NIGHTLY_RUN == "1" reason: xtensa only feature + - if: IDF_TARGET == "esp32" + reason: testing on a single target is sufficient depends_components: - perfmon diff --git a/tools/ci/check_build_test_rules.py b/tools/ci/check_build_test_rules.py index 11e964d1cb..080ce2ad55 100755 --- a/tools/ci/check_build_test_rules.py +++ b/tools/ci/check_build_test_rules.py @@ -481,6 +481,7 @@ if __name__ == '__main__': ) if arg.action == 'check-readmes': + os.environ['INCLUDE_NIGHTLY_RUN'] = '1' os.environ['NIGHTLY_RUN'] = '1' check_readme( list(check_dirs), @@ -489,6 +490,7 @@ if __name__ == '__main__': ) elif arg.action == 'check-test-scripts': os.environ['INCLUDE_NIGHTLY_RUN'] = '1' + os.environ['NIGHTLY_RUN'] = '1' check_test_scripts( list(check_dirs), exclude_dirs=_exclude_dirs,