Make sure "unit_test" will trigger all labels

- keep labels name consist with the bot variable
This commit is contained in:
Fu Hanxi 2020-11-30 11:44:37 +08:00
parent 6e545215c1
commit 6fd2d27bfd
2 changed files with 20 additions and 17 deletions

View File

@ -32,14 +32,17 @@
.if-label-integration_test: &if-label-integration_test .if-label-integration_test: &if-label-integration_test
if: '$BOT_LABEL_INTEGRATION_TEST' if: '$BOT_LABEL_INTEGRATION_TEST'
.if-label-unit_test-32_only: &if-label-unit_test-32_only .if-label-unit_test: &if-label-unit_test
if: '$BOT_LABEL_UNIT_TEST'
.if-label-unit_test-32: &if-label-unit_test-32
if: '$BOT_LABEL_UNIT_TEST_32' if: '$BOT_LABEL_UNIT_TEST_32'
.if-label-unit_test-s2_only: &if-label-unit_test-s2_only .if-label-unit_test-s2: &if-label-unit_test-s2
if: '$BOT_LABEL_UNIT_TEST_S2' if: '$BOT_LABEL_UNIT_TEST_S2'
.if-label-unit_test-all_targets: &if-label-unit_test-all_targets .if-label-unit_test-all_labels: &if-label-unit_test-all_labels
if: '$BOT_LABEL_UNIT_TEST' if: '$BOT_LABEL_UNIT_TEST || $BOT_LABEL_UNIT_TEST_32 || $BOT_LABEL_UNIT_TEST_S2'
.if-label-weekend_test: &if-label-weekend_test .if-label-weekend_test: &if-label-weekend_test
if: '$BOT_LABEL_WEEKEND_TEST' if: '$BOT_LABEL_WEEKEND_TEST'
@ -176,17 +179,19 @@
.rules:tests:unit_test: .rules:tests:unit_test:
rules: rules:
- <<: *if-protected-no_label - <<: *if-protected-no_label
- <<: *if-label-unit_test-all_targets - <<: *if-label-unit_test-all_labels
.rules:tests:unit_test_32-only: .rules:tests:unit_test_32:
rules: rules:
- <<: *if-protected-no_label - <<: *if-protected-no_label
- <<: *if-label-unit_test-32_only - <<: *if-label-unit_test
- <<: *if-label-unit_test-32
.rules:tests:unit_test_s2-only: .rules:tests:unit_test_s2:
rules: rules:
- <<: *if-protected-no_label - <<: *if-protected-no_label
- <<: *if-label-unit_test-s2_only - <<: *if-label-unit_test
- <<: *if-label-unit_test-s2
.rules:tests:integration_test: .rules:tests:integration_test:
rules: rules:
@ -199,7 +204,7 @@
- <<: *if-label-regular_test - <<: *if-label-regular_test
- <<: *if-label-example_test - <<: *if-label-example_test
- <<: *if-label-custom_test - <<: *if-label-custom_test
- <<: *if-label-unit_test-all_targets - <<: *if-label-unit_test-all_labels
- <<: *if-label-integration_test - <<: *if-label-integration_test
- <<: *if-label-weekend_test - <<: *if-label-weekend_test
@ -222,7 +227,7 @@
- <<: *if-protected-no_label - <<: *if-protected-no_label
- <<: *if-label-build - <<: *if-label-build
- <<: *if-label-regular_test - <<: *if-label-regular_test
- <<: *if-label-unit_test-all_targets - <<: *if-label-unit_test-all_labels
.rules:build_tests:example_test-weekend_test: .rules:build_tests:example_test-weekend_test:
rules: rules:
@ -247,7 +252,7 @@
- <<: *if-label-regular_test - <<: *if-label-regular_test
- <<: *if-label-example_test - <<: *if-label-example_test
- <<: *if-label-custom_test - <<: *if-label-custom_test
- <<: *if-label-unit_test-all_targets - <<: *if-label-unit_test-all_labels
.rules:build_tests:target_test-weekend_test: .rules:build_tests:target_test-weekend_test:
rules: rules:
@ -256,5 +261,5 @@
- <<: *if-label-regular_test - <<: *if-label-regular_test
- <<: *if-label-example_test - <<: *if-label-example_test
- <<: *if-label-custom_test - <<: *if-label-custom_test
- <<: *if-label-unit_test-all_targets - <<: *if-label-unit_test-all_labels
- <<: *if-label-weekend_test - <<: *if-label-weekend_test

View File

@ -83,14 +83,12 @@
.unit_test_32_template: .unit_test_32_template:
extends: extends:
- .unit_test_template - .unit_test_template
- .rules:tests:unit_test_32-only - .rules:tests:unit_test_32
- .rules:tests:unit_test
.unit_test_s2_template: .unit_test_s2_template:
extends: extends:
- .unit_test_template - .unit_test_template
- .rules:tests:unit_test_s2-only - .rules:tests:unit_test_s2
- .rules:tests:unit_test
.integration_test_template: .integration_test_template:
extends: extends: