Merge branch 'ci/lan8720_only_on_protected_and_label' into 'master'

ci: run component_ut_esp32_lan8720 only on master/release or with label

See merge request espressif/esp-idf!17644
This commit is contained in:
morris 2022-03-30 23:43:01 +08:00
commit e8aef07502
4 changed files with 28 additions and 4 deletions

View File

@ -165,3 +165,13 @@ build:integration_test:
labels: labels:
- fuzzer_test - fuzzer_test
- weekend_test - weekend_test
"labels-protected:lan8720": # UT # FIXME: IDFCI-1176 temporary run this on master/release or with label
labels:
- lan8720
included_in:
- build:unit_test
- build:unit_test-esp32
- build:target_test
- build:component_ut
- build:component_ut-esp32

View File

@ -1,6 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
# #
# SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
import argparse import argparse
@ -208,8 +208,7 @@ class RulesWriter:
else: else:
if not (name.endswith('-preview') or name.startswith('labels:')): if not (name.endswith('-preview') or name.startswith('labels:')):
_rules.append(self.RULE_PROTECTED) _rules.append(self.RULE_PROTECTED)
# Special case for esp32c3 example_test, for now it only run with label if name.startswith('test:'):
if name.startswith('test:') or name == 'labels:example_test-esp32c3':
_rules.append(self.RULE_BUILD_ONLY) _rules.append(self.RULE_BUILD_ONLY)
for label in cfg['labels']: for label in cfg['labels']:
_rules.append(self.RULE_LABEL_TEMPLATE.format(label)) _rules.append(self.RULE_LABEL_TEMPLATE.format(label))

View File

@ -366,6 +366,9 @@
.if-label-iperf_stress_test: &if-label-iperf_stress_test .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: '$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'
.if-label-macos: &if-label-macos .if-label-macos: &if-label-macos
if: '$BOT_LABEL_MACOS || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*macos(?:,[^,\n\r]+)*$/i' if: '$BOT_LABEL_MACOS || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*macos(?:,[^,\n\r]+)*$/i'
@ -432,6 +435,7 @@
- <<: *if-label-component_ut_esp32h2 - <<: *if-label-component_ut_esp32h2
- <<: *if-label-component_ut_esp32s2 - <<: *if-label-component_ut_esp32s2
- <<: *if-label-component_ut_esp32s3 - <<: *if-label-component_ut_esp32s3
- <<: *if-label-lan8720
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-label-unit_test - <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32 - <<: *if-label-unit_test_esp32
@ -457,6 +461,7 @@
- <<: *if-label-build - <<: *if-label-build
- <<: *if-label-component_ut - <<: *if-label-component_ut
- <<: *if-label-component_ut_esp32 - <<: *if-label-component_ut_esp32
- <<: *if-label-lan8720
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-label-unit_test - <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32 - <<: *if-label-unit_test_esp32
@ -914,6 +919,7 @@
- <<: *if-label-example_test_esp32s3 - <<: *if-label-example_test_esp32s3
- <<: *if-label-integration_test - <<: *if-label-integration_test
- <<: *if-label-iperf_stress_test - <<: *if-label-iperf_stress_test
- <<: *if-label-lan8720
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-label-unit_test - <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32 - <<: *if-label-unit_test_esp32
@ -948,6 +954,7 @@
when: never when: never
- <<: *if-protected - <<: *if-protected
- <<: *if-label-build - <<: *if-label-build
- <<: *if-label-lan8720
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-label-unit_test - <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32 - <<: *if-label-unit_test_esp32
@ -971,6 +978,7 @@
when: never when: never
- <<: *if-protected - <<: *if-protected
- <<: *if-label-build - <<: *if-label-build
- <<: *if-label-lan8720
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-label-unit_test - <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32 - <<: *if-label-unit_test_esp32
@ -1085,6 +1093,13 @@
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-windows changes: *patterns-windows
.rules:labels-protected:lan8720:
rules:
- <<: *if-revert-branch
when: never
- <<: *if-protected
- <<: *if-label-lan8720
.rules:labels:fuzzer_test-weekend_test: .rules:labels:fuzzer_test-weekend_test:
rules: rules:
- <<: *if-revert-branch - <<: *if-revert-branch

View File

@ -109,7 +109,7 @@ component_ut_pytest_esp32_ip101:
component_ut_pytest_esp32_lan8720: component_ut_pytest_esp32_lan8720:
extends: extends:
- .pytest_components_dir_template - .pytest_components_dir_template
- .rules:test:component_ut-esp32 - .rules:labels-protected:lan8720 # FIXME: IDFCI-1176
needs: needs:
- build_pytest_components_esp32 - build_pytest_components_esp32
variables: variables: