Skip to content

Commit

Permalink
Merge branch 'ci/enable_c2_tests_default' into 'master'
Browse files Browse the repository at this point in the history
ci: enable running C2 tests by default

See merge request espressif/esp-idf!20981
  • Loading branch information
ESP-Marius committed Nov 16, 2022
2 parents ac99c0a + d7600da commit 7a947e8
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 21 deletions.
21 changes: 0 additions & 21 deletions .gitlab/ci/dependencies/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,27 +178,6 @@ build:integration_test:
- "build:example_test"
- build:target_test

# due to the lack of runners, c2 tests will only be triggered by label
"test:{0}-esp32c2":
matrix:
- *target_test
labels:
- "{0}_esp32c2"
included_in:
- "build:{0}"
- "build:{0}-esp32c2"
- build:target_test

# overwrite the esp32c2 component ut again
"test:component_ut-esp32c2": # component_ut will trigger by unit_test as well, since now we have 2 kinds of UT
labels:
- "component_ut_esp32c2"
- "unit_test_esp32c2"
included_in:
- build:component_ut
- "build:component_ut-esp32c2"
- build:target_test

"test:integration_test":
labels:
- integration_test
Expand Down
30 changes: 30 additions & 0 deletions .gitlab/ci/rules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -596,11 +596,14 @@
- <<: *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
changes: *patterns-build_components
- <<: *if-dev-push
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-component_ut
- <<: *if-dev-push
changes: *patterns-component_ut-adc
- <<: *if-dev-push
Expand Down Expand Up @@ -805,6 +808,8 @@
changes: *patterns-build_components
- <<: *if-dev-push
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-custom_test
- <<: *if-dev-push
changes: *patterns-downloadable-tools
- <<: *if-dev-push
Expand Down Expand Up @@ -999,12 +1004,16 @@
- <<: *if-label-example_test
- <<: *if-label-example_test_esp32c2
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-build-example_test
- <<: *if-dev-push
changes: *patterns-build_components
- <<: *if-dev-push
changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-downloadable-tools
- <<: *if-dev-push
changes: *patterns-example_test
- <<: *if-dev-push
changes: *patterns-example_test-bt
- <<: *if-dev-push
Expand Down Expand Up @@ -1367,6 +1376,8 @@
changes: *patterns-target_test-i154
- <<: *if-dev-push
changes: *patterns-target_test-wifi
- <<: *if-dev-push
changes: *patterns-unit_test
- <<: *if-dev-push
changes: *patterns-unit_test-sdio
- <<: *if-dev-push
Expand Down Expand Up @@ -1556,8 +1567,13 @@
- <<: *if-protected
- <<: *if-label-build-only
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
changes: *patterns-component_ut

.rules:test:component_ut-esp32c2-adc:
rules:
Expand Down Expand Up @@ -1702,7 +1718,11 @@
- <<: *if-protected
- <<: *if-label-build-only
when: never
- <<: *if-label-custom_test
- <<: *if-label-custom_test_esp32c2
- <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-custom_test

.rules:test:custom_test-esp32c3:
rules:
Expand Down Expand Up @@ -1815,7 +1835,13 @@
- <<: *if-protected
- <<: *if-label-build-only
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
changes: *patterns-example_test

.rules:test:example_test-esp32c3:
rules:
Expand Down Expand Up @@ -1963,7 +1989,11 @@
- <<: *if-protected
- <<: *if-label-build-only
when: never
- <<: *if-label-target_test
- <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32c2
- <<: *if-dev-push
changes: *patterns-unit_test

.rules:test:unit_test-esp32c3:
rules:
Expand Down

0 comments on commit 7a947e8

Please sign in to comment.