diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index 41caf67012..52fd8c9d9a 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -65,6 +65,7 @@ - build_system included_in: - "build:{0}" + - build:target_test build:integration_test: labels: @@ -72,6 +73,8 @@ build:integration_test: patterns: - build_components - build_system + included_in: + - build:target_test #################### # Target Test Jobs # @@ -83,6 +86,7 @@ build:integration_test: labels: # For each rule, use labels and - - "{0}" - "{0}_{1}" + - target_test patterns: # For each rule, use patterns and build- - "{0}" - "build-{0}" @@ -90,7 +94,6 @@ build:integration_test: - "build:{0}" - "build:{0}-{1}" - build:target_test - - test:target_test # ------------- # Special Cases @@ -103,6 +106,7 @@ build:integration_test: - "component_ut_{0}" - unit_test - "unit_test_{0}" + - target_test patterns: - component_ut - "build-component_ut-{0}" @@ -110,17 +114,16 @@ build:integration_test: - build:component_ut - "build:component_ut-{0}" - build:target_test - - test:target_test "test:integration_test": labels: - integration_test + - target_test patterns: - integration_test included_in: - build:integration_test - build:target_test - - test:target_test "test:host_test": labels: diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 72d5bca968..2a15ace71e 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -365,6 +365,9 @@ .if-label-submodule: &if-label-submodule if: '$BOT_LABEL_SUBMODULE || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*submodule(?:,[^,\n\r]+)*$/i' +.if-label-target_test: &if-label-target_test + if: '$BOT_LABEL_TARGET_TEST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*target_test(?:,[^,\n\r]+)*$/i' + .if-label-unit_test: &if-label-unit_test if: '$BOT_LABEL_UNIT_TEST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test(?:,[^,\n\r]+)*$/i' @@ -416,6 +419,7 @@ - <<: *if-label-component_ut_esp32h2 - <<: *if-label-component_ut_esp32s2 - <<: *if-label-component_ut_esp32s3 + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32 - <<: *if-label-unit_test_esp32c2 @@ -438,6 +442,7 @@ - <<: *if-label-build - <<: *if-label-component_ut - <<: *if-label-component_ut_esp32 + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32 - <<: *if-dev-push @@ -455,6 +460,7 @@ - <<: *if-label-build - <<: *if-label-component_ut - <<: *if-label-component_ut_esp32c2 + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32c2 - <<: *if-dev-push @@ -472,6 +478,7 @@ - <<: *if-label-build - <<: *if-label-component_ut - <<: *if-label-component_ut_esp32c3 + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32c3 - <<: *if-dev-push @@ -489,6 +496,7 @@ - <<: *if-label-build - <<: *if-label-component_ut - <<: *if-label-component_ut_esp32h2 + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32h2 - <<: *if-dev-push @@ -506,6 +514,7 @@ - <<: *if-label-build - <<: *if-label-component_ut - <<: *if-label-component_ut_esp32s2 + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32s2 - <<: *if-dev-push @@ -523,6 +532,7 @@ - <<: *if-label-build - <<: *if-label-component_ut - <<: *if-label-component_ut_esp32s3 + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32s3 - <<: *if-dev-push @@ -545,6 +555,7 @@ - <<: *if-label-custom_test_esp32h2 - <<: *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 @@ -561,6 +572,7 @@ - <<: *if-label-build - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32 + - <<: *if-label-target_test - <<: *if-label-weekend_test - <<: *if-dev-push changes: *patterns-build_components @@ -577,6 +589,7 @@ - <<: *if-label-build - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32c2 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build_components - <<: *if-dev-push @@ -592,6 +605,7 @@ - <<: *if-label-build - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32c3 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build_components - <<: *if-dev-push @@ -607,6 +621,7 @@ - <<: *if-label-build - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32h2 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build_components - <<: *if-dev-push @@ -622,6 +637,7 @@ - <<: *if-label-build - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32s2 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build_components - <<: *if-dev-push @@ -637,6 +653,7 @@ - <<: *if-label-build - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32s3 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build_components - <<: *if-dev-push @@ -668,6 +685,7 @@ - <<: *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 - <<: *if-dev-push @@ -686,6 +704,7 @@ - <<: *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 - <<: *if-dev-push @@ -703,6 +722,7 @@ - <<: *if-label-build - <<: *if-label-example_test - <<: *if-label-example_test_esp32c2 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build-example_test - <<: *if-dev-push @@ -720,6 +740,7 @@ - <<: *if-label-build - <<: *if-label-example_test - <<: *if-label-example_test_esp32c3 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build-example_test - <<: *if-dev-push @@ -737,6 +758,7 @@ - <<: *if-label-build - <<: *if-label-example_test - <<: *if-label-example_test_esp32h2 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build-example_test - <<: *if-dev-push @@ -754,6 +776,7 @@ - <<: *if-label-build - <<: *if-label-example_test - <<: *if-label-example_test_esp32s2 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build-example_test - <<: *if-dev-push @@ -771,6 +794,7 @@ - <<: *if-label-build - <<: *if-label-example_test - <<: *if-label-example_test_esp32s3 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build-example_test - <<: *if-dev-push @@ -787,6 +811,7 @@ - <<: *if-protected - <<: *if-label-build - <<: *if-label-integration_test + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build_components - <<: *if-dev-push @@ -834,6 +859,7 @@ - <<: *if-label-example_test_esp32s3 - <<: *if-label-integration_test - <<: *if-label-iperf_stress_test + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32 - <<: *if-label-unit_test_esp32c2 @@ -865,6 +891,7 @@ when: never - <<: *if-protected - <<: *if-label-build + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32 - <<: *if-label-unit_test_esp32c2 @@ -885,6 +912,7 @@ when: never - <<: *if-protected - <<: *if-label-build + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32 - <<: *if-dev-push @@ -900,6 +928,7 @@ when: never - <<: *if-protected - <<: *if-label-build + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32c2 - <<: *if-dev-push @@ -915,6 +944,7 @@ when: never - <<: *if-protected - <<: *if-label-build + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32c3 - <<: *if-dev-push @@ -930,6 +960,7 @@ when: never - <<: *if-protected - <<: *if-label-build + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32h2 - <<: *if-dev-push @@ -945,6 +976,7 @@ when: never - <<: *if-protected - <<: *if-label-build + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32s2 - <<: *if-dev-push @@ -960,6 +992,7 @@ when: never - <<: *if-protected - <<: *if-label-build + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32s3 - <<: *if-dev-push @@ -1015,6 +1048,7 @@ when: never - <<: *if-label-component_ut - <<: *if-label-component_ut_esp32 + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32 - <<: *if-dev-push @@ -1029,6 +1063,7 @@ when: never - <<: *if-label-component_ut - <<: *if-label-component_ut_esp32c2 + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32c2 - <<: *if-dev-push @@ -1043,6 +1078,7 @@ when: never - <<: *if-label-component_ut - <<: *if-label-component_ut_esp32c3 + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32c3 - <<: *if-dev-push @@ -1057,6 +1093,7 @@ when: never - <<: *if-label-component_ut - <<: *if-label-component_ut_esp32h2 + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32h2 - <<: *if-dev-push @@ -1071,6 +1108,7 @@ when: never - <<: *if-label-component_ut - <<: *if-label-component_ut_esp32s2 + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32s2 - <<: *if-dev-push @@ -1085,6 +1123,7 @@ when: never - <<: *if-label-component_ut - <<: *if-label-component_ut_esp32s3 + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32s3 - <<: *if-dev-push @@ -1099,6 +1138,7 @@ when: never - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-custom_test @@ -1111,6 +1151,7 @@ when: never - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32c2 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-custom_test @@ -1123,6 +1164,7 @@ when: never - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32c3 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-custom_test @@ -1135,6 +1177,7 @@ when: never - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32h2 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-custom_test @@ -1147,6 +1190,7 @@ when: never - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32s2 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-custom_test @@ -1159,6 +1203,7 @@ when: never - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32s3 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-custom_test @@ -1171,6 +1216,7 @@ when: never - <<: *if-label-example_test - <<: *if-label-example_test_esp32 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build-example_test - <<: *if-dev-push @@ -1185,6 +1231,7 @@ when: never - <<: *if-label-example_test - <<: *if-label-example_test_esp32c2 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build-example_test - <<: *if-dev-push @@ -1199,6 +1246,7 @@ when: never - <<: *if-label-example_test - <<: *if-label-example_test_esp32c3 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build-example_test - <<: *if-dev-push @@ -1213,6 +1261,7 @@ when: never - <<: *if-label-example_test - <<: *if-label-example_test_esp32h2 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build-example_test - <<: *if-dev-push @@ -1227,6 +1276,7 @@ when: never - <<: *if-label-example_test - <<: *if-label-example_test_esp32s2 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build-example_test - <<: *if-dev-push @@ -1241,6 +1291,7 @@ when: never - <<: *if-label-example_test - <<: *if-label-example_test_esp32s3 + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build-example_test - <<: *if-dev-push @@ -1265,6 +1316,7 @@ - <<: *if-label-build-only when: never - <<: *if-label-integration_test + - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-integration_test @@ -1279,55 +1331,6 @@ - <<: *if-dev-push changes: *patterns-submodule -.rules:test:target_test: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-component_ut - - <<: *if-label-component_ut_esp32 - - <<: *if-label-component_ut_esp32c2 - - <<: *if-label-component_ut_esp32c3 - - <<: *if-label-component_ut_esp32h2 - - <<: *if-label-component_ut_esp32s2 - - <<: *if-label-component_ut_esp32s3 - - <<: *if-label-custom_test - - <<: *if-label-custom_test_esp32 - - <<: *if-label-custom_test_esp32c2 - - <<: *if-label-custom_test_esp32c3 - - <<: *if-label-custom_test_esp32h2 - - <<: *if-label-custom_test_esp32s2 - - <<: *if-label-custom_test_esp32s3 - - <<: *if-label-example_test - - <<: *if-label-example_test_esp32 - - <<: *if-label-example_test_esp32c2 - - <<: *if-label-example_test_esp32c3 - - <<: *if-label-example_test_esp32h2 - - <<: *if-label-example_test_esp32s2 - - <<: *if-label-example_test_esp32s3 - - <<: *if-label-integration_test - - <<: *if-label-unit_test - - <<: *if-label-unit_test_esp32 - - <<: *if-label-unit_test_esp32c2 - - <<: *if-label-unit_test_esp32c3 - - <<: *if-label-unit_test_esp32h2 - - <<: *if-label-unit_test_esp32s2 - - <<: *if-label-unit_test_esp32s3 - - <<: *if-dev-push - changes: *patterns-build-example_test - - <<: *if-dev-push - changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-custom_test - - <<: *if-dev-push - changes: *patterns-example_test - - <<: *if-dev-push - changes: *patterns-integration_test - - <<: *if-dev-push - changes: *patterns-unit_test - .rules:test:unit_test-esp32: rules: - <<: *if-revert-branch @@ -1335,6 +1338,7 @@ - <<: *if-protected - <<: *if-label-build-only when: never + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32 - <<: *if-dev-push @@ -1347,6 +1351,7 @@ - <<: *if-protected - <<: *if-label-build-only when: never + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32c2 - <<: *if-dev-push @@ -1359,6 +1364,7 @@ - <<: *if-protected - <<: *if-label-build-only when: never + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32c3 - <<: *if-dev-push @@ -1371,6 +1377,7 @@ - <<: *if-protected - <<: *if-label-build-only when: never + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32h2 - <<: *if-dev-push @@ -1383,6 +1390,7 @@ - <<: *if-protected - <<: *if-label-build-only when: never + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32s2 - <<: *if-dev-push @@ -1395,6 +1403,7 @@ - <<: *if-protected - <<: *if-label-build-only when: never + - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32s3 - <<: *if-dev-push