ci: run example test for c3 as well

This commit is contained in:
Fu Hanxi 2021-10-22 15:19:19 +08:00
parent c1d3b295e8
commit 9d2667d657
3 changed files with 15 additions and 29 deletions

View File

@ -69,19 +69,6 @@ build:integration_test:
- build_components - build_components
- build_system - build_system
# -------------
# Special Cases
# -------------
"build:example_test-esp32c3": # esp32c3 test is only run by label, but build jobs should always be triggered
labels:
- build
- example_test
patterns:
- build_components
- build_system
- build-example_test
- example_test
#################### ####################
# Target Test Jobs # # Target Test Jobs #
#################### ####################
@ -121,15 +108,6 @@ build:integration_test:
- test:target_test - test:target_test
- test:any_test - test:any_test
"test:example_test-esp32c3": # For esp32c3 we trigger only with label
"labels:example_test-esp32c3":
labels:
- example_test_esp32c3
included_in:
- build:example_test-esp32c3
- build:target_test
"test:integration_test": "test:integration_test":
labels: labels:
- "integration_test" - "integration_test"

View File

@ -675,12 +675,6 @@
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-windows changes: *patterns-windows
.rules:labels:example_test-esp32c3:
rules:
- <<: *if-label-build-only
when: never
- <<: *if-label-example_test_esp32c3
.rules:labels:fuzzer_test-weekend_test: .rules:labels:fuzzer_test-weekend_test:
rules: rules:
- <<: *if-label-fuzzer_test - <<: *if-label-fuzzer_test
@ -715,6 +709,7 @@
- <<: *if-label-custom_test_esp32s3 - <<: *if-label-custom_test_esp32s3
- <<: *if-label-example_test - <<: *if-label-example_test
- <<: *if-label-example_test_esp32 - <<: *if-label-example_test_esp32
- <<: *if-label-example_test_esp32c3
- <<: *if-label-example_test_esp32s2 - <<: *if-label-example_test_esp32s2
- <<: *if-label-example_test_esp32s3 - <<: *if-label-example_test_esp32s3
- <<: *if-label-host_test - <<: *if-label-host_test
@ -841,6 +836,18 @@
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test changes: *patterns-example_test
.rules:test:example_test-esp32c3:
rules:
- <<: *if-protected
- <<: *if-label-build-only
when: never
- <<: *if-label-example_test
- <<: *if-label-example_test_esp32c3
- <<: *if-dev-push
changes: *patterns-build-example_test
- <<: *if-dev-push
changes: *patterns-example_test
.rules:test:example_test-esp32s2: .rules:test:example_test-esp32s2:
rules: rules:
- <<: *if-protected - <<: *if-protected
@ -909,6 +916,7 @@
- <<: *if-label-custom_test_esp32s3 - <<: *if-label-custom_test_esp32s3
- <<: *if-label-example_test - <<: *if-label-example_test
- <<: *if-label-example_test_esp32 - <<: *if-label-example_test_esp32
- <<: *if-label-example_test_esp32c3
- <<: *if-label-example_test_esp32s2 - <<: *if-label-example_test_esp32s2
- <<: *if-label-example_test_esp32s3 - <<: *if-label-example_test_esp32s3
- <<: *if-label-integration_test - <<: *if-label-integration_test

View File

@ -75,7 +75,7 @@ test_weekend_mqtt:
.example_test_esp32c3_template: .example_test_esp32c3_template:
extends: extends:
- .example_test_template - .example_test_template
- .rules:labels:example_test-esp32c3 - .rules:test:example_test-esp32c3
.example_test_esp32s3_template: .example_test_esp32s3_template:
extends: extends: