cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add proper hostname cleanup for nxos tests (#61810)

Browse source
This commit is contained in:
Mike Wiebe 2019-09-11 10:10:14 -04:00 committed by Trishna Guha
parent b03091213d
commit c5a4086ed7
2 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
test/integration/targets/nxos_config/tasks/main.yaml
View file

@ -1,4 +1,15 @@
---
- { include: cli.yaml, tags: ['cli'] }
- { include: nxapi.yaml, tags: ['nxapi'] }
- { include: cli_config.yaml, tags: ['cli_config'] }
# Some of the tests in this suite change the hostname to switch.
# This block/always ensures the hostname gets changed back to
# the correct name.
- block:
- { include: cli.yaml, tags: ['cli'] }
- { include: nxapi.yaml, tags: ['nxapi'] }
- { include: cli_config.yaml, tags: ['cli_config'] }
always:
- name: "Change hostname back to {{ inventory_hostname_short }}"
nxos_config:
lines:
- "hostname {{ inventory_hostname_short }}"
match: none

15
test/integration/targets/nxos_smoke/tasks/main.yaml
View file

@ -1,3 +1,14 @@
---
- { include: cli.yaml, tags: ['cli'] }
- { include: nxapi.yaml, tags: ['nxapi'] }
# Some of the tests in this suite change the hostname to switch.
# This block/always ensures the hostname gets changed back to
# the correct name.
- block:
- { include: cli.yaml, tags: ['cli'] }
- { include: nxapi.yaml, tags: ['nxapi'] }
always:
- name: "Change hostname back to {{ inventory_hostname_short }}"
nxos_config:
lines:
- "hostname {{ inventory_hostname_short }}"
match: none