diff --git a/.azure-pipelines/pr_test_scripts.yaml b/.azure-pipelines/pr_test_scripts.yaml index 5b09b549d2e..f659064ebb9 100644 --- a/.azure-pipelines/pr_test_scripts.yaml +++ b/.azure-pipelines/pr_test_scripts.yaml @@ -635,6 +635,7 @@ t1-lag: t1-lag-vpp: + - acl/test_acl.py - arp/test_neighbor_mac_noptf.py - arp/test_arpall.py - arp/test_arp_update.py diff --git a/tests/acl/test_acl.py b/tests/acl/test_acl.py index 0e6094a4f17..21f50904d55 100644 --- a/tests/acl/test_acl.py +++ b/tests/acl/test_acl.py @@ -188,7 +188,14 @@ def remove_dataacl_table(duthosts): with SafeThreadPoolExecutor(max_workers=8) as executor: # Recover DUT by reloading minigraph for duthost in duthosts: - executor.submit(config_reload, duthost, config_source="minigraph", safe_reload=True, override_config=True) + executor.submit( + config_reload, + duthost, + config_source="minigraph", + safe_reload=True, + override_config=True, + check_intf_up_ports=True + ) def remove_dataacl_table_single_dut(table_name, duthost): @@ -1728,6 +1735,10 @@ def post_setup_hook(self, dut, localhost, populate_vlan_arp_entries, tbinfo, con route_convergence_delay = delay break + asic_type = dut.facts["asic_type"] + if asic_type in ["vpp"]: + route_convergence_delay += 60 + logger.info("Route count: {}, setting convergence delay to: {}".format(max_routes, route_convergence_delay)) # todo: remove the extra sleep on chassis device after bgp suppress fib pending feature is enabled diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions_sonic_vpp.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions_sonic_vpp.yaml index 59700d704ed..0a23173f962 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions_sonic_vpp.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions_sonic_vpp.yaml @@ -7,14 +7,6 @@ ####################################### ##### ACL ##### ####################################### -acl/test_acl.py: - skip: - reason: > - Failed/Errored: To be included - conditions_logical_operator: or - conditions: - - "asic_type in ['vpp']" - acl/test_stress_acl.py::test_acl_add_del_stress: skip: reason: >