diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index 58530abd94..8220351063 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -132,11 +132,11 @@ build:integration_test: - *target_test - *all_targets - - bt # example_test_005 - - wifi # example_test_002, example_test*wifi* - - ethernet # example_test*ethernet* - - sdio # component_ut_pytest_esp32_sdio + - wifi # pytest*wifi* + - ethernet # pytest*ethernet* + - sdio # pytest*sdio* - usb # USB Device & Host tests - - adc # component_ut_pytest_esp32x_adc + - adc # pytest*adc* - i154 - flash_multi - ecdsa @@ -214,31 +214,10 @@ build:integration_test: ################################# # Triggered Only By Labels Jobs # ################################# -"labels:iperf_stress_test": # example_test - labels: - - iperf_stress_test - included_in: - - build:example_test - - build:example_test-esp32 - - build:target_test - -"labels:weekend_test": # custom test - labels: - - weekend_test - included_in: - - build:custom_test - - build:custom_test-esp32 - - build:target_test - "labels:nvs_coverage": # host_test labels: - nvs_coverage -"labels:fuzzer_test-weekend_test": # host test - labels: - - fuzzer_test - - weekend_test - "labels-protected:lan8720": # UT # FIXME: IDFCI-1176 temporary run this on master/release or with label labels: - lan8720 diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 922648cf7a..deb633f3f0 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -517,9 +517,6 @@ .if-label-example_test_esp32s3: &if-label-example_test_esp32s3 if: '$BOT_LABEL_EXAMPLE_TEST_ESP32S3 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*example_test_esp32s3(?:,[^,\n\r]+)*$/i' -.if-label-fuzzer_test: &if-label-fuzzer_test - if: '$BOT_LABEL_FUZZER_TEST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*fuzzer_test(?:,[^,\n\r]+)*$/i' - .if-label-host_test: &if-label-host_test if: '$BOT_LABEL_HOST_TEST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*host_test(?:,[^,\n\r]+)*$/i' @@ -532,9 +529,6 @@ .if-label-integration_test_wifi: &if-label-integration_test_wifi if: '$BOT_LABEL_INTEGRATION_TEST_WIFI || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*integration_test_wifi(?:,[^,\n\r]+)*$/i' -.if-label-iperf_stress_test: &if-label-iperf_stress_test - if: '$BOT_LABEL_IPERF_STRESS_TEST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*iperf_stress_test(?:,[^,\n\r]+)*$/i' - .if-label-lan8720: &if-label-lan8720 if: '$BOT_LABEL_LAN8720 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*lan8720(?:,[^,\n\r]+)*$/i' @@ -577,9 +571,6 @@ .if-label-unit_test_esp32s3: &if-label-unit_test_esp32s3 if: '$BOT_LABEL_UNIT_TEST_ESP32S3 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test_esp32s3(?:,[^,\n\r]+)*$/i' -.if-label-weekend_test: &if-label-weekend_test - if: '$BOT_LABEL_WEEKEND_TEST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*weekend_test(?:,[^,\n\r]+)*$/i' - .if-label-windows: &if-label-windows if: '$BOT_LABEL_WINDOWS || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*windows(?:,[^,\n\r]+)*$/i' @@ -897,7 +888,6 @@ - <<: *if-label-custom_test_esp32s2 - <<: *if-label-custom_test_esp32s3 - <<: *if-label-target_test - - <<: *if-label-weekend_test - <<: *if-dev-push changes: *patterns-build_components - <<: *if-dev-push @@ -924,7 +914,6 @@ - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32 - <<: *if-label-target_test - - <<: *if-label-weekend_test - <<: *if-dev-push changes: *patterns-build_components - <<: *if-dev-push @@ -1129,7 +1118,6 @@ - <<: *if-label-example_test_esp32h2 - <<: *if-label-example_test_esp32s2 - <<: *if-label-example_test_esp32s3 - - <<: *if-label-iperf_stress_test - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build-example_test @@ -1173,7 +1161,6 @@ - <<: *if-label-build - <<: *if-label-example_test - <<: *if-label-example_test_esp32 - - <<: *if-label-iperf_stress_test - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build-example_test @@ -1529,7 +1516,6 @@ - <<: *if-label-integration_test - <<: *if-label-integration_test_ble - <<: *if-label-integration_test_wifi - - <<: *if-label-iperf_stress_test - <<: *if-label-lan8720 - <<: *if-label-target_test - <<: *if-label-unit_test @@ -1540,7 +1526,6 @@ - <<: *if-label-unit_test_esp32h2 - <<: *if-label-unit_test_esp32s2 - <<: *if-label-unit_test_esp32s3 - - <<: *if-label-weekend_test - <<: *if-dev-push changes: *patterns-build-example_test - <<: *if-dev-push