From 7a1c843ffd07e59b1b0ffe907cee1f9418eebdec Mon Sep 17 00:00:00 2001 From: whd <7058128+superwhd@users.noreply.github.com> Date: Fri, 14 Jan 2022 02:53:44 +0800 Subject: [PATCH] [github-actions] run MATN test cases as an individual job (#7308) MATN test cases often takes long time. We'd better move them to a separate job so that we don't have to rerun MATN cases every time a border router test fails. --- .github/workflows/otbr.yml | 14 ++++++++++++-- .../{ => MATN}/MATN_02_MLRFirstUse.py | 0 .../MATN_03_InvalidCommissionerDeregistration.py | 0 .../{ => MATN}/MATN_04_MulticastListenerTimeout.py | 0 .../MATN_05_ReregistrationToSameMulticastGroup.py | 0 .../MATN_09_DefaultBRMulticastForwarding.py | 0 .../{ => MATN}/MATN_12_HopLimitProcessing.py | 0 ...TN_15_ChangeOfPrimaryBBRTriggersRegistration.py | 0 ...argeNumberOfMulticastGroupSubscriptionsToBBR.py | 0 9 files changed, 12 insertions(+), 2 deletions(-) rename tests/scripts/thread-cert/border_router/{ => MATN}/MATN_02_MLRFirstUse.py (100%) rename tests/scripts/thread-cert/border_router/{ => MATN}/MATN_03_InvalidCommissionerDeregistration.py (100%) rename tests/scripts/thread-cert/border_router/{ => MATN}/MATN_04_MulticastListenerTimeout.py (100%) rename tests/scripts/thread-cert/border_router/{ => MATN}/MATN_05_ReregistrationToSameMulticastGroup.py (100%) rename tests/scripts/thread-cert/border_router/{ => MATN}/MATN_09_DefaultBRMulticastForwarding.py (100%) rename tests/scripts/thread-cert/border_router/{ => MATN}/MATN_12_HopLimitProcessing.py (100%) rename tests/scripts/thread-cert/border_router/{ => MATN}/MATN_15_ChangeOfPrimaryBBRTriggersRegistration.py (100%) rename tests/scripts/thread-cert/border_router/{ => MATN}/MATN_16_LargeNumberOfMulticastGroupSubscriptionsToBBR.py (100%) diff --git a/.github/workflows/otbr.yml b/.github/workflows/otbr.yml index e0633057a..f3c82a351 100644 --- a/.github/workflows/otbr.yml +++ b/.github/workflows/otbr.yml @@ -136,11 +136,21 @@ jobs: include: - otbr_mdns: "mDNSResponder" otbr_trel: 0 + cert_scripts: ./tests/scripts/thread-cert/border_router/*.py + description: "" - otbr_mdns: "mDNSResponder" otbr_trel: 1 + cert_scripts: ./tests/scripts/thread-cert/border_router/*.py + description: "" + - otbr_mdns: "mDNSResponder" + otbr_trel: 0 + cert_scripts: ./tests/scripts/thread-cert/border_router/MATN/*.py + description: "MATN" - otbr_mdns: "avahi" otbr_trel: 0 - name: BR (${{ matrix.otbr_mdns }}, TREL=${{matrix.otbr_trel}}) + cert_scripts: ./tests/scripts/thread-cert/border_router/*.py + description: "" + name: BR ${{ matrix.description }} (${{ matrix.otbr_mdns }}, TREL=${{matrix.otbr_trel}}) env: REFERENCE_DEVICE: 1 VIRTUAL_TIME: 0 @@ -196,7 +206,7 @@ jobs: run: | export CI_ENV="$(bash <(curl -s https://codecov.io/env)) -e GITHUB_ACTIONS -e COVERAGE" echo "CI_ENV=${CI_ENV}" - sudo -E ./script/test cert_suite ./tests/scripts/thread-cert/border_router/*.py || (sudo chmod a+r *.log *.json *.pcap && false) + sudo -E ./script/test cert_suite ${{ matrix.cert_scripts }} || (sudo chmod a+r *.log *.json *.pcap && false) - uses: actions/upload-artifact@v2 if: ${{ success() && steps.check_cache_result.outputs.cache-hit != 'true' }} with: diff --git a/tests/scripts/thread-cert/border_router/MATN_02_MLRFirstUse.py b/tests/scripts/thread-cert/border_router/MATN/MATN_02_MLRFirstUse.py similarity index 100% rename from tests/scripts/thread-cert/border_router/MATN_02_MLRFirstUse.py rename to tests/scripts/thread-cert/border_router/MATN/MATN_02_MLRFirstUse.py diff --git a/tests/scripts/thread-cert/border_router/MATN_03_InvalidCommissionerDeregistration.py b/tests/scripts/thread-cert/border_router/MATN/MATN_03_InvalidCommissionerDeregistration.py similarity index 100% rename from tests/scripts/thread-cert/border_router/MATN_03_InvalidCommissionerDeregistration.py rename to tests/scripts/thread-cert/border_router/MATN/MATN_03_InvalidCommissionerDeregistration.py diff --git a/tests/scripts/thread-cert/border_router/MATN_04_MulticastListenerTimeout.py b/tests/scripts/thread-cert/border_router/MATN/MATN_04_MulticastListenerTimeout.py similarity index 100% rename from tests/scripts/thread-cert/border_router/MATN_04_MulticastListenerTimeout.py rename to tests/scripts/thread-cert/border_router/MATN/MATN_04_MulticastListenerTimeout.py diff --git a/tests/scripts/thread-cert/border_router/MATN_05_ReregistrationToSameMulticastGroup.py b/tests/scripts/thread-cert/border_router/MATN/MATN_05_ReregistrationToSameMulticastGroup.py similarity index 100% rename from tests/scripts/thread-cert/border_router/MATN_05_ReregistrationToSameMulticastGroup.py rename to tests/scripts/thread-cert/border_router/MATN/MATN_05_ReregistrationToSameMulticastGroup.py diff --git a/tests/scripts/thread-cert/border_router/MATN_09_DefaultBRMulticastForwarding.py b/tests/scripts/thread-cert/border_router/MATN/MATN_09_DefaultBRMulticastForwarding.py similarity index 100% rename from tests/scripts/thread-cert/border_router/MATN_09_DefaultBRMulticastForwarding.py rename to tests/scripts/thread-cert/border_router/MATN/MATN_09_DefaultBRMulticastForwarding.py diff --git a/tests/scripts/thread-cert/border_router/MATN_12_HopLimitProcessing.py b/tests/scripts/thread-cert/border_router/MATN/MATN_12_HopLimitProcessing.py similarity index 100% rename from tests/scripts/thread-cert/border_router/MATN_12_HopLimitProcessing.py rename to tests/scripts/thread-cert/border_router/MATN/MATN_12_HopLimitProcessing.py diff --git a/tests/scripts/thread-cert/border_router/MATN_15_ChangeOfPrimaryBBRTriggersRegistration.py b/tests/scripts/thread-cert/border_router/MATN/MATN_15_ChangeOfPrimaryBBRTriggersRegistration.py similarity index 100% rename from tests/scripts/thread-cert/border_router/MATN_15_ChangeOfPrimaryBBRTriggersRegistration.py rename to tests/scripts/thread-cert/border_router/MATN/MATN_15_ChangeOfPrimaryBBRTriggersRegistration.py diff --git a/tests/scripts/thread-cert/border_router/MATN_16_LargeNumberOfMulticastGroupSubscriptionsToBBR.py b/tests/scripts/thread-cert/border_router/MATN/MATN_16_LargeNumberOfMulticastGroupSubscriptionsToBBR.py similarity index 100% rename from tests/scripts/thread-cert/border_router/MATN_16_LargeNumberOfMulticastGroupSubscriptionsToBBR.py rename to tests/scripts/thread-cert/border_router/MATN/MATN_16_LargeNumberOfMulticastGroupSubscriptionsToBBR.py