Skip to content

Commit

Permalink
Merge branch 'ansible-collections:main' into bugfix/report-changes-in…
Browse files Browse the repository at this point in the history
…-filesystem_directories
  • Loading branch information
OrrBG authored Jan 1, 2025
2 parents 0e65802 + 6d5b0f2 commit c15078a
Show file tree
Hide file tree
Showing 6 changed files with 415 additions and 5 deletions.
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ prepare_symlinks:
install-ansible-collections:
ansible-galaxy collection install --upgrade -r tests/integration/requirements.yml

.PHONY: install-python-packages
install-python-packages:
pip3 install -r tests/integration/requirements.txt

.PHONY: remove_aliases
remove_aliases:
@find tests/integration/targets/ -name "aliases" -exec rm -f {} +
Expand Down
10 changes: 10 additions & 0 deletions tests/integration/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
aiohttp
pyVim
podman
requests
pycdlib
ansible-core

pyVmomi>=6.7
# automation sdk >tag:8.0.2.0 requires pyVmomi 8
git+https://github.com/vmware/vsphere-automation-sdk-python.git@v8.0.2.0
10 changes: 5 additions & 5 deletions tests/integration/targets/vmware_rest_appliance/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
- import_tasks: appliance_localaccounts.yml
- import_tasks: appliance_monitoring.yml
- import_tasks: appliance_networking_dns_hostname.yml
- import_tasks: appliance_networking.yml
# - import_tasks: appliance_networking_firewall_inbound.yml
# - import_tasks: appliance_networking_interfaces_ipv4.yml
# - import_tasks: appliance_networking_interfaces_ipv6.yml
# - import_tasks: appliance_networking.yml - There is a bug
# - import_tasks: appliance_networking_firewall_inbound.yml - There is a bug
# - import_tasks: appliance_networking_interfaces_ipv4.yml - There is a bug
# - import_tasks: appliance_networking_interfaces_ipv6.yml - There is a bug
- import_tasks: appliance_networking_proxy.yml
# - import_tasks: appliance_services.yml
# - import_tasks: appliance_shutdown.yml
- import_tasks: appliance_system.yml
# - import_tasks: appliance_system_storage.yml
# - import_tasks: appliance_system_storage.yml - There is a bug
- import_tasks: appliance_time.yml
# - import_tasks: appliance_vmon_service.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
resource_pool_name: "{{ tiny_prefix }}-test-clone-on-library-ovf-resource-pool"
vm_name: "{{ tiny_prefix }}-clone-on-library-ovf-vm"
vm_from_ovf_image_name: "{{ tiny_prefix }}-vm-from-ovf"
vm_from_ovf_image_on_host: "{{ tiny_prefix }}-vm-from-ovf-on-host"
library_name: "{{ tiny_prefix }}-content-library-test"
remote_path: '/nfs/iso_datastore'
num_libraries_to_loop: 4
vcenter_invalid_vm_folder: "invalid-folder-name"
ovf_image_name: "ovf-image"
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- hosts: localhost
gather_facts: no
collections:
- community.vmware

tasks:
- name: Import vmware_rest_lookup_plugin test
ansible.builtin.import_role:
name: vmware_rest_library_and_ovf_clone
tags:
- eco-vcenter-ci
Loading

0 comments on commit c15078a

Please sign in to comment.