Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions ansible/roles/test/tasks/vlan_cleanup.yml

This file was deleted.

63 changes: 0 additions & 63 deletions ansible/roles/test/tasks/vlan_configure.yml

This file was deleted.

45 changes: 0 additions & 45 deletions ansible/roles/test/tasks/vlan_test.yml

This file was deleted.

20 changes: 4 additions & 16 deletions ansible/roles/test/tasks/vlantb.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
#-----------------------------------------
# Apply Vlan configuration
#-----------------------------------------
- name: Vlan test setup on testbed
include_tasks: vlan_configure.yml
- name: run test
include_tasks: roles/test/tasks/pytest_runner.yml
vars:
test_node: vlan/test_vlan.py

#-----------------------------------------
# Run Vlan test
#-----------------------------------------
- name: Vlan test run on testbed
include_tasks: vlan_test.yml

#-----------------------------------------
# Clean up Vlan configuration
#-----------------------------------------
- name: Clean up Vlan test configuration on the testbed
include_tasks: vlan_cleanup.yml
1 change: 1 addition & 0 deletions tests/pytest.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[pytest]
markers:
acl: ACL tests
bsl: BSL tests
reboot: tests which perform SONiC reboot
port_toggle: tests which toggle ports
disable_loganalyzer: make to disable automatic loganalyzer
Expand Down
Loading