From e71fa9c59f236a53167995ad75bd9aa3d1cda4ee Mon Sep 17 00:00:00 2001 From: isabelmsft <67024108+isabelmsft@users.noreply.github.com> Date: Thu, 18 May 2023 17:34:50 -0700 Subject: [PATCH] Skip RDMA tests on specific hwsku based on support (#8343) ### Description of PR Summary: There is a dependency between E2E test improvements PR: https://github.com/sonic-net/sonic-mgmt/pull/8341 and sonic-utilities GCU RDMA feature PR: https://github.com/sonic-net/sonic-utilities/pull/2791 This PR skips the RDMA tests that will fail when the platform GCU RDMA feature PR is merged. After the GCU RDMA feature PR is merged and backported to the appropriate branch, we will revert this PR to stop skipping the E2E tests, and merge the E2E test improvements PR so that the tests will pass once the feature changes take effect. --- .../conditional_mark/tests_mark_conditions.yaml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml index aace088335..74f3ce07ec 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml @@ -448,6 +448,12 @@ generic_config_updater: conditions: - "'t2' in topo_name" +generic_config_updater/test_ecn_config_update.py::test_ecn_config_updates: + skip: + reason: "This test is not run on this asic type currently" + conditions: + - "asic_type in ['cisco-8000']" + generic_config_updater/test_eth_interface.py::test_replace_fec: skip: reason: 'replace_fec ethernet test is not supported on virtual switch' @@ -475,9 +481,16 @@ generic_config_updater/test_eth_interface.py::test_update_valid_invalid_index[33 generic_config_updater/test_incremental_qos.py::test_incremental_qos_config_updates: skip: - reason: "This test was not run on this hwsku type currently" + reason: "This test is not run on this hwsku/asic type currently" conditions: - "not any(i in hwsku for i in ['2700', 'Arista-7170-64C', 'montara', 'newport'])" + - "asic_type in ['broadcom', 'cisco-8000']" + +generic_config_updater/test_mmu_dynamic_threshold_config_update.py::test_dynamic_th_config_updates: + skip: + reason: "This test is not run on this asic type currently" + conditions: + - "asic_type in ['broadcom', 'cisco-8000']" ####################################### ##### http #####