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

vmware_category/test: ensure test can run on Zuul

Browse source 
- set the zuul/vmware/vcenter_only alias
- import `prepare_vmware_tests` role
- little refactoring to avoid an extra level of indentation
This commit is contained in:
Gonéri Le Bouder 2020-01-10 13:33:07 -05:00
parent 0703590686
commit ce66743b10
3 changed files with 88 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test/integration/targets/vmware_category/aliases
View file

@ -1,3 +1,4 @@
shippable/vcenter/group1 shippable/vcenter/group1
cloud/vcenter cloud/vcenter
needs/target/prepare_vmware_tests needs/target/prepare_vmware_tests
zuul/vmware/vcenter_only

2
test/integration/targets/vmware_category/tasks/associable_obj_types.yml
View file

@ -2,8 +2,6 @@
# Copyright: (c) 2019, Abhijeet Kasurde <akasurde@redhat.com> # Copyright: (c) 2019, Abhijeet Kasurde <akasurde@redhat.com>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
- when: vcsim is not defined
block:
- name: Create different types of category with associable object types - name: Create different types of category with associable object types
vmware_category: vmware_category:
hostname: '{{ vcenter_hostname }}' hostname: '{{ vcenter_hostname }}'

4
test/integration/targets/vmware_category/tasks/main.yml
View file

@ -2,4 +2,8 @@
# Copyright: (c) 2019, Abhijeet Kasurde <akasurde@redhat.com> # Copyright: (c) 2019, Abhijeet Kasurde <akasurde@redhat.com>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
- when: vcsim is not defined
block:
- import_role:
name: prepare_vmware_tests
- include: associable_obj_types.yml - include: associable_obj_types.yml